Commit 8db04d1f4bb8874c82f750601403226438f5fb1f

Authored by atao
2 parents 1fbba169 6ed716f2

Merge branch 'branch_0808'

# Conflicts:
#	.gitignore