fixed circular ref bug in grid question
Merge remote-tracking branch 'origin/usvi' into usvi