Alex Fabijanic 3eb023132b Merge branch 'develop' into pr/1113
Conflicts:
	Foundation/testsuite/TestSuite_vs120.vcxproj
2016-03-07 21:38:26 -08:00
..
2016-03-07 21:38:26 -08:00
2016-01-08 00:17:13 +01:00