Fixed an ifdef that was dropped when solving conflict
Merge branch 'devel' of github.com:ElmerCSC/elmerfem into devel