Fix merge issue
Merge branch 'master' into gh-pages

* master:
  Fix merge issue