switched version to 4.2.1 (4.3 is for after we merge the bullet branch)
Merge branch 'master' into bullet