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