Merge pull request #2826 from mattleibow/mono.options-update