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