Merge pull request #1747 from xianyi/develop
authorMartin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Thu, 30 Aug 2018 21:42:19 +0000 (23:42 +0200)
committerGitHub <noreply@github.com>
Thu, 30 Aug 2018 21:42:19 +0000 (23:42 +0200)
Merge develop into 0.3.x for 0.3.3


Trivial merge