oops, C++11 makes me screw up
Merge branch 'master' of https://github.com/okamstudio/godot
Merge remote-tracking branch 'upstream/master'