Merge remote-tracking branch 'bska/master'
Bugfix: do not use unititialized transi_ if no gravity.
Merge remote-tracking branch 'atgeirr/master'