Sync'd branch integration/inbound with upstream @ Thu Oct  2 11:30:35 PDT 2014