Merge branch 'fix-implicit-conversion' into devel
Merge branch 'nonconst_reference' into devel