Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Sep 23 10:38:28 PDT 2014