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