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