Merge the following changes from the capsicum-test... Signed-off-by: Enji Cooper <yaneurabeya@gmail.com> Author: Enji Cooper <yaneurabeya@gmail.com> Signed-off-by: Enji Cooper <yaneurabeya@gmail.com> Author: Enji Cooper <yaneurabeya@gmail.com> Signed-off-by: Enji Cooper <yaneurabeya@gmail.com> Author: Enji Cooper <yaneurabeya@gmail.com> Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>