Open source commit. Last code changes made in April, 2012