Refs #4278 Breaking the if statements
Refs #4278 I broke the build, don't know why yet
Merge remote-tracking branch 'origin/master'