merge [3575/branches/1.0], refs #904
cleanup
cleanup
merge 94b20b7447cb2e7cb6f4c978d464ac6e891a3f93 to ece893eb863d6ca36c53354c9d8ff60283f2de7f (from 0.11)
cleanup