Merge pull request #721 from XhmikosR/master
authorJakub Pawlowicz <contact@jakubpawlowicz.com>
Sat, 9 Jan 2016 10:58:14 +0000 (10:58 +0000)
committerJakub Pawlowicz <contact@jakubpawlowicz.com>
Sat, 9 Jan 2016 10:58:14 +0000 (10:58 +0000)
Pulling in changes by @XhmikosR


Trivial merge