Sync'd branch releases/b2g30_v1_4 with upstream @ Fri Sep 19 04:09:11 PDT 2014