Fixed build issues.
Merge branch 'stable' into stable_hector