Sync'd branch integration/b2g-inbound with upstream @ Mon Oct  6 05:08:39 PDT 2014