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