Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Sep  8 17:19:52 PDT 2014