refs #844 - commit for master (in addition of 1.2)