Merge branch '5.1' of https://github.com/userfrosting/learn into 5.1

Merge branch '5.1' of https://github.com/userfrosting/learn into 5.1 #123