Merge branch 'master' into dev-table

Conflicts:
	ucw/table.h

diff --cc ucw/table.h
index 6b3f3765fdb3ce3e73b5fab88eb94a486c9b1393,e99961c145cad9d02217437c158f350f2149cc9f..be459687b6c9c3899c3282b0ff3bdf3843dcc9e7
--- 1/ucw/table.h
--- 2/ucw/table.h
+++ b/ucw/table.h
@@@ -7,11 -7,11 +7,13 @@@
  #ifndef _UCW_TABLE_H
  #define _UCW_TABLE_H
  
+ #include <inttypes.h>
+ 
  #include <ucw/fastbuf.h>
  #include <ucw/mempool.h>
 +#include <ucw/xtypes.h>
  
 +// FIXME: update these macros
  #ifdef CONFIG_UCW_CLEAN_ABI
  #define table_append_bool ucw_table_append_bool
  #define table_append_double ucw_table_append_double