Merge commit 'savannah/master'