.info cleanup.
Merge branch 'develop'