Merge branch 'Mario/intrusive' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 20 May 2017 09:29:47 +0000 (09:29 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 20 May 2017 09:29:47 +0000 (09:29 +0000)
Merge branch Mario/intrusive (S merge request)

See merge request !441


Trivial merge