v3.4 - flavor updates
v3.4 - bugfixes
v3.4 - bugfixes
v3.4 - merge
Merge remote-tracking branch 'origin/master' into ExpiredReign