clang-fix
Merge branch 'master' of github.com:isis-group/isis into gmaster