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