quarks SVN issue warning
Merge branch 'develop'