Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 09:11:50 PDT 2014