Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 13 00:23:43 PDT 2014