Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Oct 14 18:30:16 PDT 2014