Merge Dev into Master by Chris Mosetick