ref: 0697bc2f9ff85fa341dc597495413b2160636d59
parent: ae7bd71fbf5253083181c322063c24cedb638cec
parent: 4e5365b36f1626bf784b35e09aaf6ecd47a103b3
author: root <ngkaho1234@gmail.com>
date: Mon Sep 21 18:47:59 EDT 2015
Merge remote-tracking branch 'upstream/master'