added bug?
Merge commit 'd867e3eb8c42db2fe5856a43493bf7674a7fc6e5' into gh-pages