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