From 01c30bf445c234810585f777d0bb218520901315 Mon Sep 17 00:00:00 2001
From: MikeCoder <mikecoder13@gmail.com>
Date: Wed, 21 May 2014 18:32:37 +0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'lctt/master'