Merge remote-tracking branch 'andymccurdy/master' into patch-1