graph
- Ensure columns all have correct height when retrieved (to avoid e.g. empty columns because a feature extractor's start time was >0)3.0-integration 2016-11-04, by Chris Cannam
- Merge from branch piper3.0-integration 2016-11-04, by Chris Cannam
- Some updates to accommodate adaptation for Sonic Annotatorpiper 2016-11-04, by Chris Cannam
- Update subrepos to default branches after mergepiper 2016-11-04, by Chris Cannam
- A bit more log info useful for win32/x64piper 2016-11-03, by Chris Cannam
- Update to use listargs variant of Piper stuff (so that the plugin winnowing feature from the penultimate commit actually works)piper 2016-11-03, by Chris Cannam
- Make SVDEBUG always write to a log file -- formerly this was disabled in NDEBUG builds. I think there's little use to that, it just means that we keep adding more cerr debug output because we aren't getting the log we need. And SVDEBUG logging is not usually used in tight loops, I don't think the performance overhead is too serious.piper 2016-11-03, by Chris Cannam
- Use plugin scan results to inform the list requests issued to Piper serverspiper 2016-11-03, by Chris Cannam
- Mergepiper 2016-11-02, by Chris Cannam
- Subrepo statepiper 2016-11-02, by Chris Cannam
- Logging; use only first ("native") helper for non-Vamp pluginspiper 2016-11-01, by Chris Cannam
- More useful reporting outputpiper 2016-11-01, by Chris Cannam
- Add omitted files, again!piper 2016-11-01, by Chris Cannam
- Merge from branch 3.0-integrationpiper 2016-11-01, by Chris Cannam
- Support multiple plugin checker helpers, as for multiple piper servers3.0-integration 2016-11-01, by Chris Cannam
- Support for multiple servers3.0-integration 2016-11-01, by Chris Cannam
- Merge from branch piper3.0-integration 2016-10-28, by Chris Cannam
- Merge from branch project-file-reworkpiper 2016-10-28, by Chris Cannam
- Numerous Windows fixes in subreposproject-file-rework 2016-10-28, by Chris Cannam
- Ensure plugin is deleted in same thread that created and used itproject-file-rework 2016-10-28, by Chris Cannam
- Don't -Werror hereproject-file-rework 2016-10-28, by Chris Cannam
- Rename server to simple-server, and add some more description in usageproject-file-rework 2016-10-28, by Chris Cannam
- Win32 fixes in subrepos (inc binary modes for server)project-file-rework 2016-10-27, by Chris Cannam
- Error handlingproject-file-rework 2016-10-27, by Chris Cannam
- Build the converter tooproject-file-rework 2016-10-27, by Chris Cannam
- Update Piper server invocation conventionproject-file-rework 2016-10-27, by Chris Cannam
- More Windows build bitsproject-file-rework 2016-10-27, by Chris Cannam
- Win64 build flagsproject-file-rework 2016-10-26, by Chris Cannam
- Couple of overlooked definesproject-file-rework 2016-10-25, by Chris Cannam
- Tidier noconfig fileproject-file-rework 2016-10-25, by Chris Cannam
- Fix maddening failure to start server with space in its pathproject-file-rework 2016-10-25, by Chris Cannam
- Only if server not runningproject-file-rework 2016-10-25, by Chris Cannam
- Don't need these frameworks for the serverproject-file-rework 2016-10-25, by Chris Cannam
- Tidyingproject-file-rework 2016-10-25, by Chris Cannam
- Minor build updatesproject-file-rework 2016-10-25, by Chris Cannam
- OSX build updatesproject-file-rework 2016-10-25, by Chris Cannam
- OSX build fixes and logicproject-file-rework 2016-10-25, by Chris Cannam
- Add basic noconfig.priproject-file-rework 2016-10-25, by Chris Cannam
- Merge from branch piperproject-file-rework 2016-10-25, by Chris Cannam
- Mergepiper 2016-10-25, by Chris Cannam
- Add files that I forgot to track on Friday (sigh)piper 2016-10-25, by Chris Cannam
- Merge in subrepoproject-file-rework 2016-10-24, by Chris Cannam
- Cut down vastly on the number of config.pri files and places where their contents has to be effectively duplicated without themproject-file-rework 2016-10-24, by Chris Cannam
- Server project filepiper 2016-10-24, by Chris Cannam
- Error reporting for Piper server startuppiper 2016-10-21, by Chris Cannam
- Fixes to choice of plugin factorypiper 2016-10-21, by Chris Cannam
- Add out-of-process execution to prefs dialogpiper 2016-10-21, by Chris Cannam
- Default to using Piperpiper 2016-10-21, by Chris Cannam
- Restore native-Vamp factory and make the choice between Piper and Native a preferencepiper 2016-10-21, by Chris Cannam
- Use .cpp file insteadpiper 2016-10-20, by Chris Cannam
- Avoid instantiating all plugins on startup, + build fixespiper 2016-10-20, by Chris Cannam
- Update subrepos3.0-integration 2016-10-20, by Chris Cannam
- Update subrepospiper 2016-10-20, by Chris Cannam
- Merge from branch 3.0-integrationpiper 2016-10-20, by Chris Cannam
- Merge from branch msvc2015_643.0-integration 2016-10-20, by Chris Cannam
- Further MSVC build stuff. Committing this as-is because it's building and running now, but there's a lot to tidy up.msvc2015_64 2016-10-19, by Chris Cannam
- Tidy and re-fix for Linuxmsvc2015_64 2016-10-19, by Chris Cannam
- MSVC build fixes, and show 32/64-bit in Aboutmsvc2015_64 2016-10-18, by Chris Cannam
- MatrixFile is no longer used3.0-integration 2016-10-18, by Chris Cannam
- Update subrepopiper 2016-10-17, by Chris Cannam
- Update subrepopiper 2016-10-17, by Chris Cannam
- Fix compiler warningspiper 2016-10-17, by Chris Cannam
- Restore plugin categoriespiper 2016-10-17, by Chris Cannam
- More cautious locking on sparse model modificationpiper 2016-10-17, by Chris Cannam
- Pull out model creation into the transformer thread run(), so that all communications with the plugin server happen on a single thread. Then make the model accessor wait for them to be created (which still happens right at the start of processing) before returning.piper 2016-10-17, by Chris Cannam
- Try AutoPlugin; also not very successfulpiper 2016-10-14, by Chris Cannam
- Add piper-cpp stuff, experimentallypiper 2016-10-14, by Chris Cannam
- Update subrepos (bookkeeping only really)3.0-integration 2016-09-20, by Chris Cannam
- Patch from Fab Nicol to fix a problem with Recent Files menu:3.0-integration 2016-08-15, by Chris Cannam
- Avoid warning3.0-integration 2016-08-15, by Chris Cannam
- Introduce labels in RangeMapper and use them in AudioDial, though only for tooltip at present. Make use of this for spectrogram magic -81dB/-Inf threshold. Also introduce static strings for inf/pi and use where appropriate.3.0-integration 2016-08-05, by Chris Cannam
- Merge work on unified spectrogram and colour 3d plot caching renderer3.0-integration 2016-08-05, by Chris Cannam
- Since 1d317e717fe4 we no longer want to fft scale in hybrid mode. (This might also restore compatibility with Tony and prior SV save sessions -- test this.)spectrogram-minor-refactor 2016-08-05, by Chris Cannam
- Make text labels on vertical scale ticks visiblespectrogram-minor-refactor 2016-08-05, by Chris Cannam
- Fixes to phase display and colour scale for it; tidy up some debug outputspectrogram-minor-refactor 2016-08-05, by Chris Cannam
- Pull out paintDetailedScalespectrogram-minor-refactor 2016-08-05, by Chris Cannam
- Minor tidy, + go back to opaque-only spectrogram as intendedspectrogram-minor-refactor 2016-08-05, by Chris Cannam
- Restore illuminateLocalFeatures in spectrogramspectrogram-minor-refactor 2016-08-05, by Chris Cannam
- Reconnect double-click region select in spectrogramspectrogram-minor-refactor 2016-08-04, by Chris Cannam
- Restore phase displayspectrogram-minor-refactor 2016-08-04, by Chris Cannam
- Re-implement dB^2 (log-power) spectrogram settingspectrogram-minor-refactor 2016-08-04, by Chris Cannam
- Re-enable (little-used) normalise-visible-range option in spectrogram layerspectrogram-minor-refactor 2016-08-03, by Chris Cannam
- Use a count of bins rather than min and max bins (because the name maxbin tells us nothing about whether the range is inclusive or not)spectrogram-minor-refactor 2016-08-03, by Chris Cannam
- Another small tidyspectrogram-minor-refactor 2016-08-02, by Chris Cannam
- Fix vertical zoom/scroll in colour 3d plot layerspectrogram-minor-refactor 2016-08-02, by Chris Cannam
- Minor tidyspectrogram-minor-refactor 2016-08-02, by Chris Cannam
- Sensible vertical scale and hybrid normalisation range in colour 3d plotspectrogram-minor-refactor 2016-08-02, by Chris Cannam
- Minor tidyspectrogram-minor-refactor 2016-08-02, by Chris Cannam
- A threshold fixspectrogram-minor-refactor 2016-08-02, by Chris Cannam
- Float/double conversion fixesspectrogram-minor-refactor 2016-08-01, by Chris Cannam
- Fix threshold in spectrogram -- it wasn't working in the last release.spectrogram-minor-refactor 2016-08-01, by Chris Cannam
- Scale range matchingspectrogram-minor-refactor 2016-08-01, by Chris Cannam
- Some notes on gainspectrogram-minor-refactor 2016-08-01, by Chris Cannam
- Some tidyingspectrogram-minor-refactor 2016-07-22, by Chris Cannam
- Fixes and debug output for mag range calculationsspectrogram-minor-refactor 2016-07-22, by Chris Cannam
- Wiring through the magnitude range updatesspectrogram-minor-refactor 2016-07-22, by Chris Cannam
- Toward updating mag cachespectrogram-minor-refactor 2016-07-20, by Chris Cannam
- Inch toward using the mag cache (currently will crash with debug exception)spectrogram-minor-refactor 2016-07-20, by Chris Cannam
- Introduce ScrollableMagRangeCache, plus some tidying etcspectrogram-minor-refactor 2016-07-20, by Chris Cannam
- Fix translucent mode for spectrogramspectrogram-minor-refactor 2016-07-19, by Chris Cannam
- Wire up invertVerticalspectrogram-minor-refactor 2016-07-19, by Chris Cannam
- Re-enable a couple more featuresspectrogram-minor-refactor 2016-07-19, by Chris Cannam
- Tidyspectrogram-minor-refactor 2016-07-19, by Chris Cannam
- Consts and willRenderOpaquespectrogram-minor-refactor 2016-07-19, by Chris Cannam
- Colourmap rotation (inelegantly)spectrogram-minor-refactor 2016-07-19, by Chris Cannam
- Subrepo updatespectrogram-minor-refactor 2016-07-19, by Chris Cannam
- Make VerticalBinLayer an actual Layer (via SliceableLayer)spectrogram-minor-refactor 2016-07-19, by Chris Cannam
- Mergespectrogram-minor-refactor 2016-07-15, by Chris Cannam
- Update dataquay subrepo for 0.9.1last_v2.5_on_default_branch 2016-07-15, by Chris Cannam
- Start introducing translucent rendererspectrogram-minor-refactor 2016-07-18, by Chris Cannam
- Fix failure to reinitialise m_peakCachespectrogram-minor-refactor 2016-07-14, by Chris Cannam
- Remove almost all of the "old" paint logic from Colour3DPlotLayerspectrogram-minor-refactor 2016-07-14, by Chris Cannam
- Remove all of the "old" paint logic from SpectrogramLayer, even where it hasn't been completely replaced yetspectrogram-minor-refactor 2016-07-14, by Chris Cannam
- Convert ColourScaleType into an enum classspectrogram-minor-refactor 2016-07-14, by Chris Cannam
- Convert ColumnNormalization to an enum class, and separate out normalize-visiblespectrogram-minor-refactor 2016-07-14, by Chris Cannam
- Turn BinDisplay and BinScale into enum classesspectrogram-minor-refactor 2016-07-14, by Chris Cannam
- Fix potential crash in Dense3dModelPeakCache owing to combination of wrong width calculation and wrong handling of width overrunspectrogram-minor-refactor 2016-07-14, by Chris Cannam
- Delete renderersspectrogram-minor-refactor 2016-07-13, by Chris Cannam
- Begin using renderer in colour 3d plot layerspectrogram-minor-refactor 2016-07-13, by Chris Cannam
- Create, but don't yet use, a renderer in the colour 3d plot layerspectrogram-minor-refactor 2016-07-13, by Chris Cannam
- Switch in "standard" colour scale, bin scale, normalisation -- not quite handled elegantly or correctly yetspectrogram-minor-refactor 2016-07-13, by Chris Cannam
- Minor build fixspectrogram-minor-refactor 2016-07-11, by Chris Cannam
- Introduce peak frequency rendering (basics of)spectrogram-minor-refactor 2016-07-11, by Chris Cannam
- Far more pragmatic update strategyspectrogram-minor-refactor 2016-07-11, by Chris Cannam
- Fix draw buffer sizing problem in scaled renderingspectrogram-minor-refactor 2016-07-11, by Chris Cannam
- Split out cache rendering functions and some fixes to calculationsspectrogram-minor-refactor 2016-07-07, by Chris Cannam
- Colour scales (partly)spectrogram-minor-refactor 2016-07-07, by Chris Cannam
- Time-constrained renderingspectrogram-minor-refactor 2016-07-07, by Chris Cannam
- Cut over to using the renderer (though it's very incomplete) and fix some cache problems and pointer lifetime misunderstandingsspectrogram-minor-refactor 2016-07-05, by Chris Cannam
- Start to introduce renderer objectsspectrogram-minor-refactor 2016-07-05, by Chris Cannam
- One FFT model per spectrogram (again!) - but we do still need a magnitude range per view, as views could be showing different regionsspectrogram-minor-refactor 2016-07-05, by Chris Cannam
- One FFT size method, no member for itspectrogram-minor-refactor 2016-07-02, by Chris Cannam
- Simplify the oversampling/zero-padding logic. FFT model selection no longer depends on the view.spectrogram-minor-refactor 2016-07-01, by Chris Cannam
- Add VerticalBinLayer to SpectrogramLayerspectrogram-minor-refactor 2016-07-01, by Chris Cannam
- Scale and copyspectrogram-minor-refactor 2016-07-01, by Chris Cannam
- Start introducing render codespectrogram-minor-refactor 2016-07-01, by Chris Cannam
- VerticalBinLayer for vertical mapping abstraction. Not totally sure about thisspectrogram-minor-refactor 2016-07-01, by Chris Cannam
- Commentsspectrogram-minor-refactor 2016-06-30, by Chris Cannam
- Minor adjustmentsspectrogram-minor-refactor 2016-06-30, by Chris Cannam
- More filling in render & cache codespectrogram-minor-refactor 2016-06-30, by Chris Cannam
- Move drawVisibleText to PaintAssistantspectrogram-minor-refactor 2016-06-30, by Chris Cannam
- Move LayerGeometryProvider from view to layerspectrogram-minor-refactor 2016-06-30, by Chris Cannam
- Two functions, rather than one with a boolean argspectrogram-minor-refactor 2016-06-30, by Chris Cannam
- Another tiny bitspectrogram-minor-refactor 2016-06-29, by Chris Cannam
- Pull out render timerspectrogram-minor-refactor 2016-06-29, by Chris Cannam
- More renderer stubbingspectrogram-minor-refactor 2016-06-29, by Chris Cannam
- Commentsspectrogram-minor-refactor 2016-06-27, by Chris Cannam
- Start stubbing Colour3DPlotRendererspectrogram-minor-refactor 2016-06-23, by Chris Cannam
- Use a params structurespectrogram-minor-refactor 2016-06-23, by Chris Cannam
- ColourScale class, comments, namingspectrogram-minor-refactor 2016-06-23, by Chris Cannam
- Commentspectrogram-minor-refactor 2016-06-23, by Chris Cannam
- Commentsspectrogram-minor-refactor 2016-06-23, by Chris Cannam
- Fix possible crash when scrolling to endspectrogram-minor-refactor 2016-06-23, by Chris Cannam
- Extend column logic to peak frequency display as well, and correct some scopes according to whether values are per source column or per target pixelspectrogram-minor-refactor 2016-06-20, by Chris Cannam
- Pull out column ops into ColumnOpspectrogram-minor-refactor 2016-06-20, by Chris Cannam
- A more sensible order for column operationsspectrogram-minor-refactor 2016-06-17, by Chris Cannam
- Don't need thesespectrogram-minor-refactor 2016-06-15, by Chris Cannam
- Replace old logic with calls to new functions; basic refactor part A done, the code now compiles againspectrogram-minor-refactor 2016-06-15, by Chris Cannam
- A couple more helper functionsspectrogram-minor-refactor 2016-06-15, by Chris Cannam
- Mid-refactor to pull out the bulk of paintDrawBuffer into chunksspectrogram-minor-refactor 2016-06-13, by Chris Cannam
- Merge from default branchspectrogram-minor-refactor 2016-06-13, by Chris Cannam
- Subrepo update3.0-integration 2016-06-13, by Chris Cannam
- Don't paint if model has zero width3.0-integration 2016-05-26, by Chris Cannam
- Make archiver check & complain if the appropriate docs page returns a 4043.0-integration 2016-05-05, by Chris Cannam
- Subrepo update3.0-integration 2016-05-04, by Chris Cannam
- Win32 build fix3.0-integration 2016-05-03, by Chris Cannam
- Update Qt copyright note3.0-integration 2016-04-27, by Chris Cannam
- Version on this branch will be 3.03.0-integration 2016-04-27, by Chris Cannam
- Deploy plugin checker helper; update deployment for current Qt3.0-integration 2016-04-27, by Chris Cannam
- OSX build fixes3.0-integration 2016-04-27, by Chris Cannam
- Update subrepos3.0-integration 2016-04-22, by Chris Cannam
- Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf3.0-plus-imaf 2016-04-20, by Chris Cannam
- Merge from branch pluginscan3.0-integration 2016-04-15, by Chris Cannam
- Check for plugin scan helper checker helper program in suitable directory, & tidy up warning messages somewhatpluginscan 2016-04-15, by Chris Cannam
- Update checker code layoutpluginscan 2016-04-14, by Chris Cannam
- Make this warning a #pragma message, as we don't want it to make compilation fail with -Werror setpluginscan 2016-04-14, by Chris Cannam
- Make use of, and warn for, the plugin checker for all types of plugin. Haven't yet resolved the question of how to install and find it.pluginscan 2016-04-14, by Chris Cannam
- First cut running (but not yet using output of, or recovering from errors in) the plugin checker at startuppluginscan 2016-04-14, by Chris Cannam
- Remove Vamp SDK from dependency builds for Windows, as for OSX3.0-integration 2016-03-18, by Chris Cannam
- Start including Vamp SDK into main build, as we do with Sonic Annotator3.0-integration 2016-03-18, by Chris Cannam
- Update subrepo2016-03-04, by Chris Cannam
- Merge from default!3.0-integration 2016-03-04, by Chris Cannam
- Merge from default branch in subrepos3.0-integration 2016-03-04, by Chris Cannam
- Merge in subrepo2016-03-04, by Chris Cannam
- Merge in subrepo3.0-integration 2016-03-02, by Chris Cannam
- Make ViewProxy objects share the ids of their Views; fixes incorrect colour scale drawing3.0-integration 2016-02-09, by Chris Cannam
- Clumsily avoid segfault on pulse shutdown3.0-integration 2016-02-09, by Chris Cannam
- Update i18n files3.0-integration 2016-02-04, by Chris Cannam
- Merge from default branch3.0-integration 2016-02-04, by Chris Cannam
- Merge subrepos3.0-integration 2016-02-04, by Chris Cannam
- Merge from branch "spectrogram-minor-refactor"3.0-integration 2016-02-04, by Chris Cannam
- Truncate edges when about to paint beyond limits of cachespectrogram-minor-refactor 2016-02-03, by Chris Cannam
- Don't use partial paints when zoomed in far enough to have boundary alignment concerns. (But boundary calculations are still wrong, leading to a logic error exception.)spectrogram-minor-refactor 2016-02-02, by Chris Cannam
- Commentspectrogram-minor-refactor 2016-02-02, by Chris Cannam
- Timing tweaks to reduce the number of repaintsspectrogram-minor-refactor 2016-02-02, by Chris Cannam
- Fix cache validity boundary conditionspectrogram-minor-refactor 2016-02-02, by Chris Cannam
- *Really* add overlooked file!spectrogram-minor-refactor 2016-02-02, by Chris Cannam
- Be a bit more flexible about which symbol to accept in resampler selectionspectrogram-minor-refactor 2016-02-02, by Chris Cannam
- Revert last commit (wrong branch)2016-02-02, by Chris Cannam
- Add overlooked file!2016-02-02, by Chris Cannam
- Updated Czech localisation file from Pavel Fric2016-02-01, by Chris Cannam
- Update subrepo2016-01-30, by Chris Cannam
- Update acinclude files to look for qt5-qmake as well as qmake-qt52016-01-30, by Chris Cannam
- Further fixes to the scrollable cache logicspectrogram-minor-refactor 2016-01-29, by Chris Cannam
- Start refactoring out the spectrogram image cachespectrogram-minor-refactor 2016-01-29, by Chris Cannam
- Subrepo updatespectrogram-minor-refactor 2016-01-27, by Chris Cannam
- build fixspectrogram-minor-refactor 2016-01-27, by Chris Cannam
- OS/X updatesspectrogram-minor-refactor 2016-01-27, by Chris Cannam
- Fix calculation of repaint area when we haven't scrolled but cache is not completespectrogram-minor-refactor 2016-01-27, by Chris Cannam
- Start repainting from the middle -- but this is quite unreliablespectrogram-minor-refactor 2016-01-26, by Chris Cannam
- Fix return value from paintDrawBuffer in rightToLeft case; propagate timing change to PeakFrequencies version as wellspectrogram-minor-refactor 2016-01-26, by Chris Cannam
- Draw right-to-left when adjoining an existing cache valid area on the rightspectrogram-minor-refactor 2016-01-26, by Chris Cannam
- Make paint method do its own timing and abandon if it's taking too long (still needs some work on queueing correct repaints of the remainder)spectrogram-minor-refactor 2016-01-25, by Chris Cannam
- Rearrange cache update calculations so as to use the actual painted width returned by paint functions (though they only ever return the same width as requested, at this point)spectrogram-minor-refactor 2016-01-25, by Chris Cannam
- Avoid reusing a large paint width if the zoom level has changed (in case it has changed dramatically, as for example when the user hits the F key). Also some tidying and adjustment to timing stuff3.0-integration 2016-01-22, by Chris Cannam
- Tidy a bit3.0-integration 2016-01-22, by Chris Cannam
- Subrepos3.0-integration 2016-01-22, by Chris Cannam
- Convert 3d model column type from QVector to std::vector; replace another user of ResizeableBitset3.0-integration 2016-01-22, by Chris Cannam
- Subrepos3.0-integration 2016-01-22, by Chris Cannam
- Subrepos3.0-integration 2016-01-22, by Chris Cannam
- Merge3.0-integration 2016-01-21, by Chris Cannam
- Subrepo update3.0-integration 2015-12-10, by Chris Cannam
- Mutex fix in bqaudioio to avoid delay in seeking during playback3.0-integration 2016-01-21, by Chris Cannam
- Update translations3.0-integration 2016-01-21, by Chris Cannam
- Make colour 3d plot layer colour a preference as well3.0-integration 2016-01-21, by Chris Cannam
- Add default spectrogram colours to prefs3.0-integration 2016-01-20, by Chris Cannam
- Merge from branch colourschemes3.0-integration 2016-01-19, by Chris Cannam
- Tidycolourschemes 2016-01-19, by Chris Cannam
- Rearrange colours, make some of them more attractive, give some of them nicer namescolourschemes 2016-01-19, by Chris Cannam
- Remove background mode, it no longer works properlycolourschemes 2016-01-19, by Chris Cannam
- Remove debug outcolourschemes 2016-01-19, by Chris Cannam
- Provide a sensible name for this colour schemecolourschemes 2016-01-19, by Chris Cannam
- Merge from branch 3.0-integrationcolourschemes 2016-01-19, by Chris Cannam
- Merge from branch plugin-startup-test3.0-integration 2016-01-19, by Chris Cannam
- Show warning to the user when plugin population has problemsplugin-startup-test 2016-01-19, by Chris Cannam
- Check for plugin loadability before trying to load in the main process (POSIX only so far)plugin-startup-test 2016-01-11, by Chris Cannam
- Pull out candidate listplugin-startup-test 2016-01-08, by Chris Cannam
- Experimentation with colour schemes and mappingscolourschemes 2015-12-02, by Chris Cannam
- Update icons3.0-integration 2015-12-02, by Chris Cannam
- Merge from default branch3.0-integration 2015-11-18, by Chris Cannam
