HenrikBengtsson Merge branch 'release/0.6.0'
193dee5 Feb 26, 2015
Merge branch 'release/0.6.0'
193dee5