Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 14:49:41 PDT 2014