Bug ZK-2453: JS error on page load
Merge branch 'B70-ZK-2453' of https://github.com/chunfuchang/zk