Imported from the main tree because a version bump were required Signed-off-by: Alexander Golubev <fatzer2@gmail.com>