Merge remote-tracking branch 'origin/stable-1.0'

Conflicts:
	plugins/CMakeLists.txt
	plugins/zynaddsubfx/src/Effects/Alienwah.cpp
	src/core/track.cpp

src/core/track.cpp

@@ -1095,7 +1095,7 @@ void trackContentWidget::dropEvent( QDropEvent * _de )
 		m_trackView->trackContainerView()->fixedTCOs() == false )
 	{
 		const MidiTime pos = getPosition( _de->pos().x()
-							).toNearestTact();
+                            ).getTact() * MidiTime::ticksPerTact();
 		getTrack()->addJournalCheckPoint();
 		trackContentObject * tco = getTrack()->createTCO( pos );