Fixed previous git reset error.
Workaround for MSVC2013 x64
Merge branch 'develop'