Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 05:44:46 PDT 2014