Merge remote-tracking branch 'origin/Jay'
Display error when observation isn't found
Merge remote-tracking branch 'origin/Jay'
Merge remote-tracking branch 'origin/Jay'
Merge remote-tracking branch 'origin/master' into Jay