Merge commit 'HEAD'; commit 'savannah/master'