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