CODE: Allow the MSVS project to build a 64-bit command line server for debugging
Merge branch '11.x' into 12.x
Merge branch '12.x' into devel-new