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