Merge branch 'release/Sleep_Tight_Jim_Weirich'
Composer updated
Merge branch 'hotfix/3.1.1' into Development