Merge branch '1.3.x-release'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 23 Feb 2016 21:48:26 +0000 (22:48 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 23 Feb 2016 21:48:26 +0000 (22:48 +0100)

Trivial merge