Merge branch 'master' into 43-magic-methods