Remove in progress IF from Christian
Resolved merge conflicts
Resolved merge conflicts
Merge pull request #1369 from timlinux/develop

Remove in progress IF from Christian