Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Sep 15 09:40:07 PDT 2014