Bug #1378583 merge