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