Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 15:08:34 PDT 2014