Sync'd branch integration/inbound with upstream @ Thu Oct  9 05:15:38 PDT 2014