Fix Visual Studio 2013 compilation error "ambiguous call to overloaded function“
fix indentation
Merge pull request #1176 from joshuastray/develop

Fix Visual Studio 2013 compilation error