Windower/Lua — pull request #820 by z16 (2014-05-15 00:46:59+00:00)
Title: Merge pull request #819 from Windower/4.1

Updated missing conflicting values