More debugging info.
Merge branch 'develop' of github.com:nearinfinity/honeycomb into develop