Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Sep 29 11:19:41 PDT 2014