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