alpha-0.8.7 + indent-fix
Merge branch 'alpha-0.8.7'