v3.4 - automatic building flavor calculation
Merge remote-tracking branch 'origin/master' into ExpiredReign