Messed up merge - whoops
Updated version to 16.04