Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 22:38:43 PDT 2014