Merge remote-tracking branch 'joelverhagen/master'