merge 34cf1aad3135e227380d91ace7b1a6c8255e8278 to 2ddc87f23522226bbf3354bd304fec23fadb5a18 (from 1.0), refs #894