Sync'd branch integration/inbound with upstream @ Thu Oct  9 21:41:40 PDT 2014