2014-12-30
Merge remote-tracking branch 'origin/master'
2014-12-30

Signed-off-by: yuanach <yuanach@126.com>