Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 08:43:41 PDT 2014