Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Sep  1 00:02:35 PDT 2014