v3.5.0 (17 Jul. 2014)
v3.5.1 (3 Aug. 2014)
Merge branch 'master' into CPsafe (v3.4.1 -> v3.5.1)

Conflicts:
	src/mssmUtils.cpp