DEVELOPMENT: Thu Oct 30 11:54:37 CET 2014
Merge branch 'development' into test