Frame Proposal Updates#24

floating wants to merge 2 commits intoaragon:masteraragon/flock:masterfrom

floating:masterfloating/flock:masterCopy head branch name to clipboard