Merge branch 'develop' into shmem
authorMartin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Thu, 9 Nov 2017 22:20:54 +0000 (23:20 +0100)
committerGitHub <noreply@github.com>
Thu, 9 Nov 2017 22:20:54 +0000 (23:20 +0100)

Trivial merge