Merge branch 'master' into terencehill/slider_anim_improvements
authorterencehill <piuntn@gmail.com>
Sat, 5 Sep 2015 10:42:06 +0000 (12:42 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 5 Sep 2015 10:42:06 +0000 (12:42 +0200)

Trivial merge