Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Aug 26 19:38:47 PDT 2014