1.0.2dev: Merge [11944] from 0.12-stable (refs #3446)
1.0.2dev: Merge [11944] from 0.12-stable (refs #3446)

git-svn-id: 3bd1c7f5b9365705bff4dd56977498491f5ac132@11945 af82e41b-90c4-0310-8c96-b1721e28e2e2

exocad/exotrac,exocad/exotrac,exocad/exotrac,exocad/exotrac