Merge branch 'master' into gh-pages

This commit is contained in:
Aktanusa
2017-04-17 11:30:55 -04:00