Sync'd branch integration/inbound with upstream @ Wed Oct 22 12:42:47 PDT 2014