Merge branch 'cleanups-4.7' into for-chris-4.7-20160516