Build #1:   Merge remote-tracking branch 'origin/master' into bugfix/fix_travis # Conflicts: # src... on branch bugfix/fix_travis almost 8 years ago