Readying for remerge.
Merged bay_opt_fix into master.
Merge branch 'master' of github.com:FrederikDiehl/apsis