Merge remote-tracking branch 'refs/remotes/origin/fix_limitdays' into fix_limitdays

Author: sdetweil