Josh: Merge master
Josh: merge again
Josh: wierd merge bug fixing