upgrade devel to 2.1-RC3