[Nektar-users] Recent merge into master