Remove unreachable code
Merge branch '0.4'