Merge branch 'assert-limit'
authorClifford Wolf <clifford@clifford.at>
Fri, 1 Jul 2016 10:24:31 +0000 (12:24 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 1 Jul 2016 10:24:31 +0000 (12:24 +0200)

Trivial merge