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