Pick a commit from master as Gluon 2013.3.1 won't build