Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 05:30:42 PDT 2014