Auto merge of #34 - saurvs:master, r=emilio …

Add GetActiveUniform

Part of servo/servo#10397

bors-servo committed Apr 5, 2016