Prevent solution buttons from being added multiple times.
Merge branch 'master' into api-1.1