Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Sep 23 11:57:31 PDT 2014