2.1.1b

merge with upstream