Merge remote-tracking branch 'placemeup/master' into master-github