#983 PR merged: Merge pull request #982 from rear/dev

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

synchronize dev and master branch


[Export of Github issue for rear/rear.]