Merge updates for 4.1.2.j and 4.1.2.k into master

Something got messed up, somehow.  It doesn't look like 4.1.2.j ever got merged into the master branch.  Meanwhile, I couldn't seem to push my private 4.1.2.k branch to my fork.  To get these all to show up in a pull request, I merged both 4.1.2.j and 4.1.2.k into my private master branch and pushed that, which is what you are seeing now.

I guess that if you execute this pull request, you will update the master branch a) without officially merging 4.1.2.j and b) bypassing an official 4.1.2.k branch altogether.

So, if you would like to handle this differently, please feel free to delete this pull request.