Closes #571
Merge branch 'master' into lookandfeel