Merge master changed into dev#4170

tmorehouse merged 3 commits intodevbootstrap-vue/bootstrap-vue:devfrom

masterbootstrap-vue/bootstrap-vue:masterCopy head branch name to clipboard