Sync'd branch integration/inbound with upstream @ Wed Oct 29 15:22:36 PDT 2014