Merge branch 'master' into terencehill/tooltips_cleanup
authorterencehill <piuntn@gmail.com>
Sat, 3 Oct 2015 20:47:15 +0000 (22:47 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 3 Oct 2015 20:47:15 +0000 (22:47 +0200)

Trivial merge