Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 14:28:38 PDT 2014