Why did I put that in the loop in the first place? No need to perform two checks when one will do.
Merge branch 'master' into fbase64