Merge commit 'alioth/master'