Sync'd branch integration/b2g-inbound with upstream @ Sun Oct 12 06:39:21 PDT 2014