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