Merge branch 'misc-4.7' into for-chris-4.7-20160525