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