refs #262, make lock_memory a uint64_t
Merge branch 'bugs/262' into releases/1.0