Merge branch 'logan'

Conflicts:
info.php
resolve