Merge branch 'master' into ccweaver
filter bottom drop ups
Merge branch 'ccweaver'