rc3
Merge pull request #252 from whirm/rc3

rc3