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