so much changes
merge in progress
Merge branch 'master' into samson
w/e