bug #1130 fixed
Merge branch 'master' into unit_test
switch to master