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