Removed redundant conditional.
Merge branch 'master' into graphical