Merge branch 'closefrom' into 'master'