Update to Psych 4.0.x#134

marksiemers wants to merge 2 commits into

pluff:masterpluff/crystalball:masterfrom

marksiemers:mastermarksiemers/crystalball:masterCopy head branch name to clipboard