Merge commit '45ea177' into tempit5

Signed-off-by: Jeremy Ho <jujaga@gmail.com>