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