Comment 2 for bug 1558160

Tested successfully on Xubuntu 15.10 and committed rev. 14727.
Note that I removed the unnecessary indentations in the .cpp file to keep our code consistent.

Thanks!