Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Oct 14 19:02:29 PDT 2014