David Hemphill 58aa6ee56e Merge branch 'master' into remove-outdated-docs
# Conflicts:
#	docs/source/_layouts/master.blade.php
2017-10-30 22:49:31 -05:00
..
2017-10-30 22:44:54 -05:00
2017-10-30 22:44:54 -05:00