fix borked 28a2e6f2a4e2b8c652f120bad9d6e80ee92017c2, refs #946
merge [3787/branches/0.11], refs #946