Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 15 11:18:45 PDT 2014