Merging remote into local before pushing to master to correct Real -> core::Real in a pilot app (to fix compilation with some versions of gcc).