version 7.x-0.60.2
Merge branch 'release/7.x-0.60.2'