Merge commit 'f17a0dd1c2' into clk-next

This commit is contained in:
Michael Turquette 2016-06-16 22:07:08 -07:00
commit 071a0cb66c