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