Merge branches 'arm.2016.06.14a', 'clk.2016.06.15a' and 'power.2016.06.15a' into HEAD