Merge agouti:prog/core
authorMikko Rasa <tdb@tdb.fi>
Wed, 27 Jul 2016 15:49:16 +0000 (18:49 +0300)
committerMikko Rasa <tdb@tdb.fi>
Wed, 27 Jul 2016 15:49:16 +0000 (18:49 +0300)

Trivial merge