Version 05.006 (11.02.2014)
Merge branch 'master' into test-FAN
Version 05.006 (11.02.2014)