Merge branch 'release-0.16'
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 6 Feb 2015 12:29:19 +0000 (14:29 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 6 Feb 2015 12:29:19 +0000 (14:29 +0200)

Trivial merge