Add more traditional (American) mixins
Add more traditional (American) mixins
Add more traditional (American) mixins
manual merge of murtaugh
more merging from murtaugh master