Merge branch 'hotfix/2.1.2.1' into Development
Cleanup of messy Gravatar image tag in template. This is faster and cleaner.
Merge branch 'release/2.1.3'