Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 22 18:54:57 PDT 2014