Sync'd branch integration/inbound with upstream @ Wed Oct 29 20:40:38 PDT 2014