Merge remote-tracking branch 'svn/trunk'
Merge remote-tracking branch 'svn/trunk'
Merge branch 'master' of github.com:gebner/gapt