Prepare for 0.16 tag