Merge branch 'develop' into feature/ldns-signzone-engine-support

diff --cc examples/ldns-signzone.c
index 0a790e66f8dbe663afd59eb84932875339101d61,797bab43b9f2293bc69cb3014a335b1638de93e9..8fa7ae777fd9868f792d39ebb72b82a36d2a477c
--- 1/examples/ldns-signzone.c
--- 2/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@@ -552,8 -316,15 +553,9 @@@ main(int argc, char *argv[]
        char *outputfile_name = NULL;
        FILE *outputfile;
        
 -      /* tmp vars for engine keys */
 -      char *eng_key_l;
 -      size_t eng_key_id_len;
 -      char *eng_key_id;
 -      int eng_key_algo;
 -      
        bool use_nsec3 = false;
        int signflags = 0;
+       bool unixtime_serial = false;
  
        /* Add the given keys to the zone if they are not yet present */
        bool add_keys = true;