Merge branch 'feature/upgrade-rosalia-to-0.3.2.6' into develop
Merge branch 'feature/VS2013-support_3rd_party_test_framework' into develop