* remotes/upstream/master: imagick exception rev update diabook: use proper defaults in popup sidebar config diabook boxes: use a common hide/show form entry definition remove lots of duplicated code in diabook config handling