6d facedir
Merge pull request #564 from RealBadAngel/master

6d facedir
Merge remote-tracking branch 'upstream/master' into flolands