Sync'd branch integration/inbound with upstream @ Fri Oct 31 02:17:43 PDT 2014