add changes from wheezy, commented out