Minor changes to play nicely with Waxe
Merge remote-tracking branch 'origin/master'