Review main Merged

9132[CLEANUP] Remove simulate static from Core

Markus Klein CR +2 V +2 Hard +47 −664 updated 06/03/13, 20:49