This commit squashes commits by: Kasper <[email protected]> jath03 <[email protected]> Adam Honse <[email protected]> Commits squashed and amended for code style by Adam Honse <[email protected]>