Manual double-update from jaabaST/adamTracking. This should bring jaaba up-to-date with jaabaST/adamTracking as of right now, ie relevant changes in jaabaST through 194069b have been included.