merged from master

working on stopping the huge merge errors