Remove the "should wait and see"
Merge branch '1017-quick' of github.com:openscholar/openscholar into 1017-quick