Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 23:23:40 PDT 2014