Sync'd branch releases/b2g30_v1_4 with upstream @ Fri Sep  5 10:02:32 PDT 2014