Upstream org changes
Merge branch 'devel' of github.com:rvf0068/emacs.d into devel