patch for #247
Merge branch 'dev3' into test