Some extra changes from head
5 files changed