From d955d8e592638b50431fdb736fd390ab2ce089c1 Mon Sep 17 00:00:00 2001
From: Allan Zhou <allanzp@gmail.com>
Date: Thu, 23 Jan 2014 14:28:38 -0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'