Added comment.
Merge branch 'master' into notifications