Sync'd branch integration/inbound with upstream @ Wed Oct 22 08:35:53 PDT 2014