Sync'd branch integration/inbound with upstream @ Fri Oct  3 23:04:43 PDT 2014