From af9266600f8a99e82eda9160f16bb339a06d8a95 Mon Sep 17 00:00:00 2001
From: MikeCoder <mikecoder13@gmail.com>
Date: Thu, 5 Jun 2014 12:49:06 +0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'lctt/master'