#1010 PR merged: sync master with dev tree

gdha opened issue at 2016-09-23 10:38:

[Export of Github issue for rear/rear.]