Update change_optdone pull request

This merges master into you branch and will allow your pull request to be merged automatically...