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