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