Merge branch 'master', remote-tracking branch 'origin/master'
2013/8/9

Signed-off-by: unknown <Tech@stu-tech.(none)>