Fixed a bug where the wrong variable was being printed.
Merge branch 'master' into devel