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