Merge commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929' * commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929': when we reset a paint, it should return to the state it was in when it was first created.
Merge commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929' * commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929': when we reset a paint, it should return to the state it was in when it was first created.