[sr-dev] git:master:0868ce2e: Merge pull request #814 from linuxmaniac/vseva/3010