Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 15 12:08:41 PDT 2014