Style fix - use when instead of if
Fix paths with spaces not working on linux & osx
Merge branch 'develop'
Merge remote-tracking branch 'refs/remotes/github/master'
Bump version 3.1 -> 3.2