Merge branch 'vim' into floating_point