Merge commit 'spearce/master'