Updates from hotfix 4.1.2.k that were missing from the develop branch.
Merge pull request #109 from tbohn/finish_hotfix_4.1.2.k

Updates from hotfix 4.1.2.k that were missing from the develop branch.
Merge remote-tracking branch 'upstream/develop' into develop