Sync'd branch releases/b2g30_v1_4 with upstream @ Wed Sep  3 03:38:25 PDT 2014