Merge remote-tracking branch 'origin/easy'
Merge branch 'easy'
Release: v1.15
Merge branch 'master' into development