updated packaging for 1.11
update Makefile defines for 1.11.1
Merge branch 'version-update' into 1.11