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