Merge branch 'issue/2972'
Merge branch 'issue/2968'
Merge branch 'issue/3022'
Merge branch 'issue/3021'
Merge branch 'issue/2943'
Project Curiosity begins for 1.3.6dev
Closed #3029 Removed debug statements leftover from fixes for issue #2968
Merge branch 'issue/3029'
Merge remote-tracking branch 'upstream/master' into 1.3.x