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