Merge pull request #1129 from laanwj/2012_04_opcodes