Merge pull request #4117 from scottbasgaard/master

Ran 2.1 through the grinder and cleaned up various undefined variable notices.
mp6 bits #4042
mp6 #4042
meta formatting #3926