Merge branch 'master' into ast_no_templates

Conflicts:
	configure.ac
	exec.cpp

parser.h

@@ -352,6 +352,9 @@ class parser_t
     void print_errors(wcstring &target, const wchar_t *prefix);
     void print_errors_stderr();
 
+    /** Create a job */
+    job_t *job_create();
+
 public:
     std::vector<profile_item_t*> profile_items;
 
@@ -457,9 +460,6 @@ class parser_t
     /** Return a description of the given blocktype */
     const wchar_t *get_block_desc(int block) const;
 
-    /** Create a job */
-    job_t *job_create();
-
     /** Removes a job */
     bool job_remove(job_t *job);