Merge commit 30c2e70 back into master branch

Change was mistakenly pushed to ```gh-pages``` instead of ```master```. This pull request will bring the ```master``` branch up to date again.