thinkaurelius/titan — pull request #655 by xedin (2014-06-01 02:06:05+00:00)
Title: Issue 629

There could a conflict with 649, please let me know when it's going to be merge so I will merge this branch with titan05.