#982 PR merged: synchronize dev and master branch

gdha opened issue at 2016-08-25 08:16:

bring the branches in sync

[Export of Github issue for rear/rear.]