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