Updates for VIC 4.1.2.k.  Note, these contain a repeat of 4.1.2.j for some reason.  Somehow my master branch lost the changes to 4.1.2.j, so I re-applied them to bring it up to date.
Merge branch 'VIC.4.1.2.k'

Conflicts:
	src/README.txt
	src/global.h