Sync'd branch integration/inbound with upstream @ Wed Oct 29 13:53:40 PDT 2014