Sync'd branch integration/inbound with upstream @ Wed Oct 29 19:52:39 PDT 2014