Appease std::move declarations for CLANG
Merge branch 'gchpaco_compile_fix' into next