Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 14:16:45 PDT 2014