Sync'd branch integration/inbound with upstream @ Tue Oct 21 11:10:40 PDT 2014