Sync'd branch integration/inbound with upstream @ Thu Oct  2 21:52:38 PDT 2014