Commit bc46b1547ba68014fbceb6c0d9ede4d2d143735b

Merge branch 'master' of yousource.it.jyu.fi:fgj2014/fgj2014