Sync'd branch releases/b2g30_v1_4 with upstream @ Wed Sep 10 07:08:34 PDT 2014