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