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