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