Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 07:22:40 PDT 2014