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