Sync'd branch integration/b2g-inbound with upstream @ Sun Oct 26 19:48:48 PDT 2014