Merge commit 'origin/master'; commit 'savannah/master'