Changing stable tag to trunk, updating to 2.1.1