Sync'd branch integration/inbound with upstream @ Fri Oct 31 07:12:35 PDT 2014