pb
Merge remote-tracking branch 'origin/master'

Conflicts:
	msvc12a/PythonBinding/PythonBinding.vcxproj
	msvc12a/PythonBinding/PythonBinding.vcxproj.filters