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