Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 18:10:50 PDT 2014