* origin/stable:
  Update checksum for Noto fonts release 1.002
  toradex: add support for u-boot update on colibri vf
  Update Colibri-VF recpies to use latest meta-toradex (V2.3)
  Fix Linux Kernel 3.18 build with Colibri-VF
  scripts: use correct upload path
  toradex: update toradex meta layer
  Change mirror of hunspell dictionaries
  Install CJK fonts on eLinux image

Conflicts:
	conf/distro/include/colibri-vf.conf
	meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
	recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
	scripts/manifest.xml
	scripts/upload.sh

Change-Id: I38f7fc045264d13e3a1c6c4afd4e7355ac8f56c9