Sync'd branch integration/b2g-inbound with upstream @ Mon Oct  6 15:18:44 PDT 2014