Merge branch 'master-issue-216' into master-patched