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