Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 12:58:48 PDT 2014