Merge pull request #283 from harveyfeng/master

test staging stuff
(cherry picked from commit 536c9ad38cb6267941db8971dbd8339ccd5a00a3)

Signed-off-by: Reynold Xin <rxin@apache.org>