commit d2f21bc93e96d9ac36b1925c0b0b137a7edc94d2 Merge: a0c8d3fa6 a6b085602 Author: Torkel Ödegaard <torkel.odegaard@gmail.com> Date: Mon Jan 26 15:56:39 2015 +0100 Merge branch 'master' into pro
