Synchronized with FreeELKS git#6d30dc69eb67c9fd9e03d580606730fc1ea1c3c4 (2013/09/03).