Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Sep 22 08:14:29 PDT 2014