Merge pull request #593 from Brad-Edwards/dev#690

Brad-Edwards merged 2 commits into

devBrad-Edwards/aces:devfrom

mainBrad-Edwards/aces:mainCopy head branch name to clipboard