Updated cabal version to match reality
Receive latest changes from 'master' into client-receive-messages