Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Sep  2 13:28:26 PDT 2014