automated 968207, #428
Merge pull request #435 from alda519/bz_968207

automated 968207, #428