Sync'd branch integration/inbound with upstream @ Wed Oct 22 06:36:44 PDT 2014