Fix missing return
Merge branch 'refs/heads/master' into gh-pages

* refs/heads/master:
  Fix missing return