Merge branch 'master' into terencehill/slider_anim_improvements
authorterencehill <piuntn@gmail.com>
Wed, 2 Sep 2015 17:26:30 +0000 (19:26 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 2 Sep 2015 17:26:30 +0000 (19:26 +0200)

Trivial merge