question show page alsmot done
Merge branch 'master' into jake