update
mantis #1160
Merge branch 'development'