resolve conflicts
resolve conflicts
Tagging version 7.x-0.16.
Merge branch 'release/7.x-0.16'