Merge branch 'vokal-isaac-master'
Updating versions and dates