Merge pull request #1192 from learning-unlimited/stable-feb14-backports

Stable feb14 backports
Merge pull request #1141 from learning-unlimited/lua-issue-1056

Fixes issue #1056: catalog sort by timeblock(cherry picked from commit 364b36d36b2d56781171e5df95b8285c0c165f5b)