Sync'd branch releases/b2g30_v1_4 with upstream @ Sat Oct 11 10:34:31 PDT 2014