Merge branch 'master' into develop
Merge branch 'develop' of github.com:jwilsson/AnySlider into develop
Happy new year is a bit late now