Sync'd branch integration/inbound with upstream @ Mon Oct  6 15:10:46 PDT 2014