Merge branch 'stable-1.2'

# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	src/core/Track.cpp

doc/CONTRIBUTORS

@@ -9,24 +9,26 @@ Colin Wallace <wallacoloo@gmail.com>
 Oskar Wallgren <oskar.wallgren13@gmail.com>
 Raine M. Ekman <raine@iki.fi>
 Umcaruje <uros.maravic@gmail.com>
-Michael Gregorius <michael.gregorius.git@arcor.de>
+Hyunjin Song <tteu.ingog@gmail.com>
 Javier Serrano Polo <javier--IfwAyVwL9S8xJKrdU2QtlAdbjyPl9T@jasp.net>
+Michael Gregorius <michael.gregorius.git@arcor.de>
 grejppi <grejppi@gmail.com>
 Javier Serrano Polo <javier@jasp.net>
-Hyunjin Song <tteu.ingog@gmail.com>
 Wong Cho Ching <chwong249664@yahoo.com>
 Alexandre Almeida <wilsalx@gmail.com>
 Daniel Winzen <d@winzen4.de>
 LMMS Service Account <lmms.service@gmail.com>
 Steffen Baranowsky <BaraMGB@freenet.de>
 Danny McRae <khjklujn@yahoo.com>
+Johannes Lorenz <j.git@lorenz-ho.me>
 Garrett <g@floft.net>
-Hyunin Song <tteu.ingog@gmail.com>
 liushuyu <liushuyu011@gmail.com>
+Dominic Clark <mrdomclark@gmail.com>
+Hyunin Song <tteu.ingog@gmail.com>
 Andrew Kelley <superjoe30@gmail.com>
+Spekular <Spekularr@gmail.com>
 Andreas Brandmaier <andy@brandmaier.de>
 Fastigium <fastigiummusic@gmail.com>
-Spekular <Spekularr@gmail.com>
 Amadeus Folego <amadeusfolego@gmail.com>
 Jonas Trappenberg <jonas@trappenberg.ch>
 M374LX <wilsalx@gmail.com>
@@ -35,18 +37,17 @@ grindhold <grindhold@gmx.net>
 Mike Choi <rdavidian71@gmail.com>
 Karmo Rosental <karmo.rosental@gmail.com>
 Christopher L. Simons <christopherleesimons@gmail.com>
-Dominic Clark <mrdomclark@gmail.com>
 NoiseByNorthwest <noisebynorthwest@gmail.com>
-falkTX <falktx@gmail.com>
-Johannes Lorenz <johannes89@mailueberfall.de>
 Rebecca DeField <rebeccadefield@gmail.com>
+falkTX <falktx@gmail.com>
 Stian Jørgensrud <stianahj@gmail.com>
+David Carlier <devnexen@gmail.com>
 Ryan Roden-Corrent <ryan@rcorre.net>
+Shmuel H <shmuelhazan0@gmail.com>
 midi-pascal <midi-pascal@videotron.ca>
 Augustin Cavalier <waddlesplash@gmail.com>
 BaraMGB <BaraMGB@freenet.de>
 Csaba Hruska <csaba.hruska@gmail.com>
-David Carlier <devnexen@gmail.com>
 DeRobyJ <derobyj@gmail.com>
 Hussam Eddin Alhomsi <hussameddin.alhomsi@gmail.com>
 Rüdiger Ranft <rudi@qzzq.de>
@@ -66,11 +67,15 @@ Jonathan Aquilina <eagles051387@gmail.com>
 Mohammad Amin Sameti <mamins1376@gmail.com>
 ra <symbiants@gmail.com>
 wongcc966422 <wongcc966422@users.noreply.github.com>
+Cyp <cyp@wz2100.net>
 David CARLIER <devnexen@gmail.com>
+Douglas <34612565+DouglasDGI@users.noreply.github.com>
 Gurjot Singh <bhattigurjot@gmail.com>
 Janne Sinisalo <janne.m.sinisalo@gmail.com>
 Krzysztof Foltman <wdev@foltman.com>
 Lou Herard <lherard@gmail.com>
+Noah Brecht <noahb2713@gmail.com>
+Olivier Humbert <trebmuh@tuxfamily.org>
 Paul Batchelor <thisispaulbatchelor@gmail.com>
 Paul Wayper <paulway@mabula.net>
 Petter Reinholdtsen <pere@hungry.com>
@@ -86,9 +91,8 @@ Cyrille Bollu <cyrille.bollu2@gmail.com>
 Dan Williams <BumblingCoder@users.noreply.github.com>
 Ian Sannar <ian.sannar@gmail.com>
 Jaroslav Petrnoušek <baegus@gmail.com>
-Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com>
-Johannes Lorenz <j.git@lorenz-ho.me>
 Kenneth Perry (thothonegan) <thothonegan@gmail.com>
+Kevin Zander <veratil@gmail.com>
 LYF610400210 <lyfjxymf@sina.com>
 Lukas W <lukas@Lukass-iMac.fritz.box>
 Mark-Agent003 <wgreeves01@gmail.com>
@@ -101,29 +105,37 @@ Rebecca LaVie <rebeccadefield@gmail.com>
 Roberto Giaconia <DeRobyJ@users.noreply.github.com>
 SecondFlight <qbgeekjtw@gmail.com>
 Steffen Baranowsky <baramgb@freenet.de>
+T0NIT0 RMX <t0nit0rmx@gmail.com>
 TheTravelingSpaceman <smuts.walter@gmail.com>
 Thomas Clark <the.thomas.j.clark@gmail.com>
 gnudles <gnudles@users.noreply.github.com>
 liushuyu <liushuyu_011@163.com>
+makepost <makepost@firemail.cc>
 miketurn <miketurn1234@yahoo.com>
 psyomn <lethaljellybean@gmail.com>
 quadro <quadro2@email.cz>
 sarahkeefe <sarahjanekeefe@gmail.com>
+thmueller64 <64359888+thmueller64@users.noreply.github.com>
 Achim Settelmeier <lmms@m1.sirlab.de>
+Alexandra Dutton <alxdttn@umich.edu>
+Andreas Müller <schnitzeltony@gmail.com>
 André Hentschel <nerv@dawncrow.de>
 Armin Kazmi <armin.kazmi@tu-dortmund.de>
+Artur Twardowski <32247490+artur-twardowski@users.noreply.github.com>
 Attila Herman <attila589@gmail.com>
 Bastian Kummer <bastian.kummer@securepoint.de>
 Christopher A. Oliver <oliver@onion.private>
+Cyp <48363+Cyp@users.noreply.github.com>
 Devin Venable <venable.devin@gmail.com>
 Diego Ramos Ruggeri <diego@ruggeri.net.br>
-Douglas <34612565+DouglasDGI@users.noreply.github.com>
 DragonEagle <allensoard@yahoo.com>
 Filip Hron <filip.hron@gmail.com>
 Frank Mather <tinycat2001@gmail.com>
 Frederik <freggy@gmail.com>
+Gingka Akiyama <33764485+GingkathFox@users.noreply.github.com>
 Greg Simpson <geedubess@users.noreply.github.com>
 Hexasoft <yperret@in2p3.fr>
+Hubert Figuière <hub@figuiere.net>
 IvanMaldonado <ivan.gm94@gmail.com>
 Ivo Wetzel <ivo.wetzel@googlemail.com>
 Jens Lang <jenslang@users.sf.net>
@@ -138,17 +150,17 @@ Lee Avital <leeavital@gmail.com>
 LocoMatt <samozelko123@gmail.com>
 Léo Andrès <leo@ndrs.fr>
 Markus Elfring <elfring@users.sourceforge.net>
+Martin Pavelek <he29.HS@gmail.com>
 Maurizio Lo Bosco <maurizio.lobosco@gmail.com>
 Mehdi <powergame_coder2@yahoo.com>
 Mikobuntu <chrissy.mc.1@hotmail.co.uk>
 Mingcong Bai <jeffbai@aosc.xyz>
 Nikos Chantziaras <realnc@arcor.de>
-Noah Brecht <noahb2713@gmail.com>
 Ododo <olivierdautricourt@gmail.com>
-Olivier Humbert <trebmuh@users.noreply.github.com>
 Paul Nasca <zynaddsubfx_AT_yahoo com>
 Peter Nelson <peter1138@users.sourceforge.net>
 Ra <symbiants@gmail.com>
+Ron U <sharpblade4@gmail.com>
 Ryan Schmidt <github@ryandesign.com>
 Shane Ambler <GitHub@ShaneWare.Biz>
 Simon Jackson (Netbook) <jackokring@gmail.com>
@@ -170,13 +182,15 @@ follower <follower@rancidbacon.com>
 fundamental <mark.d.mccurry@gmail.com>
 gandalf3 <gandalf3@users.noreply.github.com>
 groboclown <matt@groboclown.net>
+https://gitlab.com/users/CYBERDEViLNL <1148379+CYBERDEViLNL@users.noreply.github.com>
 irrenhaus3 <irrenhaus3@users.noreply.github.com>
 jasp00 <javier--IfwAyVwL9S8xJKrdU2QtlAdbjyPl9T@jasp.net>
 justnope <dont@email.invalid>
 kamnxt <kamnxt@kamnxt.com>
+knittl <knittl89+github@gmail.com>
 lmmsservice <lmms.service@gmail.com>
 m-xbutterfly <m-xbutterfly@tutanota.com>
-noahb01 <noahb2713@gmail.com>
+necrashter <iiilker99@gmail.com>
 projectpitchin <githobbyacct@gmail.com>
 rgwan <kmlinuxm@gmail.com>
 xhe <xhebox@users.noreply.github.com>