Fix attribute fieldtypes in 1.5#2416

alecritson merged 5 commits intolunarphp:1.xlunarphp/lunar:1.xfrom

ryanmitchell:fix/1.5-rich-textryanmitchell/lunar:fix/1.5-rich-textCopy head branch name to clipboard