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