Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 00:33:42 PDT 2014