Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 11:18:41 PDT 2014