[lsnipes/f12/master] (24 commits) ...Initial pseudo merge for dist-git setup