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