quick hack to avoid troubles with /mnt/asec
Merge branch 'develop' into gradle