Sync'd branch integration/inbound with upstream @ Wed Oct 22 13:21:11 PDT 2014