Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 13:19:42 PDT 2014