Updates for v2.2.2
Merge branch 'DEV2.2.2' of https://github.com/p2t2/figaro into DEV2.2.2