Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 22 15:14:16 PDT 2014