Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 15:19:03 PDT 2014