merge!
authorYrjan A. F. Fraschetti <yrjanaff@MacBook-Pro.local>
Sun, 22 Nov 2015 21:24:45 +0000 (22:24 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@MacBook-Pro.local>
Sun, 22 Nov 2015 21:24:45 +0000 (22:24 +0100)

Trivial merge