Pre-Merge Commit
DevSynch
Merge branch 'master' of github.com:nickman/shorthand