Merge 2.4 into master

Original pull requests:

* #2818 from StevenPuttemans:fix_linux_tutorial
* #2834 from atinfinity:pullreq/140606-TickMeter-2.4