Update ta2 branch for testing the new commits of stat-313 in combination with updates of ta2.
merged
mentioned in commit 506c2606
unassigned @walle