Merge branch 'hotfix/0.2.4'
temporary iOS yyyy bug workaround (attempt 4)
Merge branch 'hotfix/0.2.5' into dev