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