Sync'd branch releases/b2g30_v1_4 with upstream @ Fri Sep 12 10:19:35 PDT 2014