Merge branch 'nunivalence'
authorAnders Mörtberg <andersmortberg@gmail.com>
Sat, 23 Jan 2016 17:40:21 +0000 (12:40 -0500)
committerAnders Mörtberg <andersmortberg@gmail.com>
Sat, 23 Jan 2016 17:40:21 +0000 (12:40 -0500)

Trivial merge