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