Sync'd branch integration/inbound with upstream @ Wed Oct 29 01:37:40 PDT 2014