Update from Maclaw's 20140228 sources

Signed-off-by: zwliew <zhaoweiliew@gmail.com>