Dev -> master (stats)

Kindly ignore the four fail commits :)