Sync'd branch integration/inbound with upstream @ Fri Oct 24 23:10:42 PDT 2014