[beep/f13/master] (22 commits) ...Initial pseudo merge for dist-git setup