Stable 47: Fixed #52
Merge remote-tracking branch 'origin/tests'