Version: 05.02.001 (10.03.2014)
Merge branch 'master' into test-FAN