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