Minot changes
Merge remote-tracking branch 'origin/masterOfAllThatIsEvil' into masterOfAllThatIsEvil