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