Merge branch 'master' into script_devel with new optical functions.