Sync'd branch integration/inbound with upstream @ Wed Oct 22 21:19:41 PDT 2014