Preparing release 2.1