This patch only implements the feature, indentation fix is to follow. This ensures that the actual change can be more easily reviewed. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>