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