december improvements #2

Open
GKaszewski wants to merge 7 commits from december into master