Sync'd branch integration/inbound with upstream @ Wed Oct 29 11:21:50 PDT 2014