Merge branch 'sunoffset' of https://github.com/lnevo/Libraries.git into dev
Merge branch 'release' of https://github.com/lnevo/Libraries.git into dev
Merge branch 'master' into current