Merge remote-tracking branch 'origin/master' into weyland
Magic.
Merge branch 'weyland2' of https://github.com/anidev/HokiePlanner into weyland2