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