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