2.1.5 and 2.2 compatible field-type loading
Merge branch '1.2/master' of https://github.com/firesale/FireSale into 1.2/master