Merge commit 'johnw/master'