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