#992 PR merged: Master update from dev

gdha opened issue at 2016-08-31 14:55:

[Export of Github issue for rear/rear.]