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