Merge from mattsta's PR collection

Original PR: antirez/lua-cmsgpack#30