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