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