Merge branch '1.6.x'

.travis.yml

@@ -64,7 +64,7 @@ script:
     - cd build
     - ../configure --enable-perl --enable-python --enable-tcl --enable-cyrus --enable-charset $CFGFLAGS CXXFLAGS="$CXXFLAGS $MYCXXFLAGS" LDFLAGS="$LDFLAGS $MYLDFLAGS"
     - cat config.log
-    - make V=1 -j3
+    - make V=1
     - make V=1 test
     - sudo make install
     - cd ..

modules/data/webadmin/tmpl/encoding_settings.tmpl

@@ -1,4 +1,9 @@
 <div class="encoding-settings">
+	<? IF EncodingDisabled ?>
+	<div>
+		ZNC is compiled without encodings support. <a href="http://icu-project.org/">ICU</a> is required for it.
+	</div>
+	<? ENDIF ?>
 	<div>
 		<div class="checkboxandlabel checkbox">
 			<input type="radio" name="encoding_utf" id="encoding_utf_legacy" value="legacy" <? IF EncodingUtf == "legacy" ?>checked="checked"<? ENDIF ?> <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />