andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,641 Commits 1 Branch 0 Tags 24 MiB
97a089ed3a
Commit Graph

2249 Commits

Author SHA1 Message Date
Stein Magnus Jodal
0d16502da1 docs: Require Pykka for docs building (fixes #1500) 
Pykka is a pure Python dependency, so we might as well depend on it for
docs building so that :autoclass: works on Pykka subclasses in the docs.
 2016-08-07 09:03:21 +02:00
Stein Magnus Jodal
12e0c87c99 docs: Fix warnings about unknown options 2016-08-07 08:51:20 +02:00
Stein Magnus Jodal
02a2788da0 docs: Cleanup changelog 2016-08-07 08:37:44 +02:00
Thomas Adamcik
9d4b62db14 audio: Update scanner to handle sources that only have dynamic pads 
Fixes #1479
 2016-07-27 21:43:41 +02:00
Thomas Adamcik
aa3293673a Merge branch 'release-2.0' into develop 2016-07-27 00:30:39 +02:00
Thomas Adamcik
e594d560ff audio: Make sure tags are never none (Fixes #1449) 2016-07-26 21:33:16 +02:00
Thomas Adamcik
ad4225d38d audio: Make scanner handle media with not duration (Fixes: #1526) 2016-07-26 21:16:31 +02:00
Thomas Adamcik
242a771062 docs: Add sphinx_rtd_theme in docs/requirements.txt 2016-07-25 23:48:53 +02:00
Thomas Adamcik
c1679964ff docs: Add PR#1525 and PR#1517 to changelog 2016-07-25 22:09:52 +02:00
Thomas Adamcik
44ff669744 Merge pull request #1534 from edran/fix-scrobbling 
Get correct track position on change events
 2016-07-25 22:08:41 +02:00
Thomas Adamcik
0c6be281df doc: Add changelog entry for PR#1496 and PR#1522 2016-07-25 21:53:21 +02:00
Nantas Nardelli
500ff70b87 Add changelog entry for #1534, and fix #1523 typo 2016-07-24 21:52:15 +01:00
ismailof
65498485fe Add changelog entry 2016-06-26 11:19:08 +02:00
ismailof
95ac2714ff Add changelog entry 2016-06-26 11:18:34 +02:00
Benjamin Chrétien
37cd296552 mpd: fix protocol for replay_gain_status 2016-05-31 16:36:37 +02:00
Stein Magnus Jodal
df0d534a56 docs: Depend on sphinx_rtd_theme 
As of Sphinx 1.4, it is no longer a transitive dependency, so we need
to depend on it explicitly.
 2016-04-01 08:12:29 +02:00
Jens Luetjen
b581d5a574 Update documentation. 
Update persistent feature in changelog and config description.
 2016-03-31 20:41:47 +02:00
Jens Luetjen
2bb9e39ba6 Merge branch 'develop' of https://github.com/mopidy/mopidy into fix/310-persist-mopidy-state-between-runs 2016-03-31 19:04:45 +02:00
Stein Magnus Jodal
d51b283c26 Merge branch 'release-2.0' into develop 2016-03-26 20:28:09 +01:00
Stein Magnus Jodal
227a660ecf Merge branch 'fix/1345-file-crashes-on-non-ascii-media-dir' into release-2.0 2016-03-26 20:27:42 +01:00
Thomas Adamcik
5e640979f4 Merge pull request #1493 from jodal/fix/1345-file-crashes-on-non-ascii-media-dir 
file: Fix crash when media_dirs contains non-ASCII chars
 2016-03-26 20:24:22 +01:00
Stein Magnus Jodal
095329ce82 docs: PR #1472 fixes #1469 2016-03-26 11:55:25 +01:00
Stein Magnus Jodal
8820a88e0c file: Fix crash when media_dirs contains non-ASCII chars 
Fixes #1345
 2016-03-26 11:30:35 +01:00
Stein Magnus Jodal
3e196a88cb Merge branch 'release-2.0' into develop 2016-03-26 09:59:27 +01:00
Stein Magnus Jodal
aafcf8559d docs: Add PR #1455 to changelog 2016-03-26 09:51:14 +01:00
Thomas Adamcik
accd6bd1a9 docs: Add duration fix to changelog. 2016-03-25 15:18:13 +01:00
Thomas Adamcik
3c535409ad docs: Add buffer fix to changelog 2016-03-25 14:34:15 +01:00
Stein Magnus Jodal
9c05cc8d05 Merge branch 'release-2.0' into develop 2016-02-22 12:43:13 +01:00
Stein Magnus Jodal
1e8bef25d3 audio: Set soft-volume flag on playbin 2016-02-22 12:42:56 +01:00
Jens Luetjen
854357a295 Merge branch 'develop' of https://github.com/mopidy/mopidy into fix/310-persist-mopidy-state-between-runs 
Conflicts:
	mopidy/core/playback.py
	tests/core/test_playback.py

revert _backend_error_handling
revert endless loop prevention
 2016-02-17 22:18:50 +01:00
Stein Magnus Jodal
75a365ea0d Merge branch 'release-2.0' into develop 2016-02-15 23:45:37 +01:00
Stein Magnus Jodal
6107254cb0 Merge branch 'master' into release-2.0 2016-02-15 23:45:02 +01:00
Stein Magnus Jodal
23098d7d93 docs: Fix broken link 2016-02-15 23:44:48 +01:00
Stein Magnus Jodal
0a4e1b15c8 docs: Add changelog section for 2.0.1 2016-02-15 22:15:18 +01:00
Stein Magnus Jodal
32c135a124 docs: Add changelog section for 2.1.0 2016-02-15 22:14:14 +01:00
Stein Magnus Jodal
665eccda93 docs: Add v2.0.0 release date 2016-02-15 22:02:46 +01:00
Stein Magnus Jodal
9a6636a974 Merge pull request #1447 from adamcik/fix/1445-unify-stream-uri-handling 
Make sure the stream backend playback/library handle URIs the same way
 2016-02-15 20:58:42 +01:00
Thomas Adamcik
3f0d7b96d0 docs: Add stream backend to changelog 2016-02-15 20:53:05 +01:00
Nick Steel
5c1a4c66f2 docs: final pedantic changelog wording change. 2016-02-14 23:06:11 +00:00
Nick Steel
a0c0ab4cde docs: changelog minor rewording 2016-02-14 22:34:03 +00:00
Stein Magnus Jodal
2d989c581d docs: Summary of 2.0 release 2016-02-14 22:57:12 +01:00
Stein Magnus Jodal
f3c31538e6 audio: Remove unused 'capabilities' argument 2016-02-14 22:39:31 +01:00
Stein Magnus Jodal
cd4e3fa37b docs: Tweak changelog 2016-02-14 22:36:38 +01:00
Stein Magnus Jodal
494e29ebaf docs: Remove docs for deprecated local/ configs 2016-02-14 22:28:55 +01:00
Trygve Aaberge
08ebb3b699 docs: Library view is only slow with ncmpcpp <= 0.5 2016-02-14 16:46:08 +01:00
Thomas Adamcik
d20621c801 docs: Add changelog entry for tags_changed 2016-02-14 12:36:55 +01:00
Thomas Kemmer
6aef96a0d3 Fix #1428: Add m3u/base_dir confval. 2016-02-14 12:07:22 +01:00
Trygve Aaberge
59dadc6535 docs: Link to config and clarify buffer size 2016-02-14 00:21:22 +01:00
Trygve Aaberge
0580a46688 audio: Add a config option for queue buffer size 
It may help to increase this for users that are experiencing buffering
before track changes. Workaround for #1409.
 2016-02-13 23:37:22 +01:00
Stein Magnus Jodal
68add6cda9 audio: Workaround crash caused by race 
Fixes #1430. See #1222 for explanation and proper fix.
 2016-02-10 23:03:36 +01:00
Stein Magnus Jodal
4691bf5ea6 process: Remove unused BaseThread class 2016-02-10 21:09:16 +01:00
Stein Magnus Jodal
6d856e88bb docs: Add missing packages for Debian stable and Ubuntu < 15.10 
Fixes #1434
 2016-02-10 19:12:59 +01:00
Jens Luetjen
bc981355bc Merge branch 'develop' of https://github.com/mopidy/mopidy into fix/310-persist-mopidy-state-between-runs 2016-02-08 18:45:58 +01:00
Stein Magnus Jodal
4d0bc755a0 docs: Fix typo 2016-02-07 13:03:19 +01:00
Stein Magnus Jodal
78d10c4ab8 Reduce variation in Pykka imports 
Which lets us reduce the amount of mocked modules when building docs
 2016-02-07 12:55:13 +01:00
Stein Magnus Jodal
95b21599c7 docs: Update mocks for docs build without all deps 
Fixes #1431
 2016-02-07 12:45:16 +01:00
Jens Luetjen
9d8034869d Chance type of core.restore_state config value 
Change to boolean to simplify the user configuration.
 2016-02-06 15:48:43 +01:00
Jens Luetjen
df55c3ebd9 Merge branch 'develop' of https://github.com/mopidy/mopidy into fix/310-persist-mopidy-state-between-runs 2016-02-06 14:06:23 +01:00
Stein Magnus Jodal
e7184cf0b3 Bump version to 2.0.0 because of GStreamer 1 
Doing it right away instead of just before release for compat with
Mopidy-Spotify's develop branch.
 2016-02-06 01:23:23 +01:00
Stein Magnus Jodal
ace7634804 gst1: Require GStreamer >= 1.2.3 2016-02-05 12:05:30 +01:00
Jens Luetjen
af78f5952c Merge branch 'develop' of https://github.com/mopidy/mopidy into fix/310-persist-mopidy-state-between-runs 
Conflicts:
	docs/config.rst
Fix conflicts
 2016-02-04 21:13:03 +01:00
Stein Magnus Jodal
0ac50ed499 docs: Update Arch source install to use new gst-python2 package 
Thanks to Sergej Pupykin
 2016-02-04 14:45:39 +01:00
Stein Magnus Jodal
d0783db422 docs: Fix link text 2016-02-04 00:12:19 +01:00
Stein Magnus Jodal
79cdc16d64 Merge pull request #1426 from adamcik/fix/1404-duplicate-seeks 
audio: Prevent double seeks in appsrc (fixes: #1404)
 2016-02-03 23:40:31 +01:00
Stein Magnus Jodal
42a0f63ece docs: Update Icecast streaming section 
Fixes #1351
 2016-02-03 23:37:07 +01:00
Stein Magnus Jodal
851c206d45 docs: Move advanced audio setups out of config page 2016-02-03 23:11:18 +01:00
Thomas Adamcik
0336b6077c audio: Prevent double seeks in appsrc (fixes: #1404) 
Sending the seek event to the playbin forwards it to all sinks. Which in turn
means on seek event per sink. To avoid this we inject the seek event in an
element before the tee.
 2016-02-03 22:38:25 +01:00
Stein Magnus Jodal
30b50b64d3 docs: Update gst-{launch,inspect}-{0.10 => 1.0} 2016-02-03 22:24:20 +01:00
Stein Magnus Jodal
c749647a7b deps: lamemp3enc replaces lame in Gst1 2016-02-03 22:10:11 +01:00
Jens Luetjen
0a1e43c876 Merge branch 'develop' of https://github.com/mopidy/mopidy into fix/310-persist-mopidy-state-between-runs 
Conflicts:
	mopidy/audio/scan.py
Fix conflicts.
 2016-02-03 22:01:51 +01:00
Trygve Aaberge
4e39f0969a docs: Capitalize TCP in service docs 2016-02-03 13:41:04 +01:00
Stein Magnus Jodal
ccb80bd5aa Merge pull request #1422 from trygveaa/docs/service-pulseaudio 
docs: Add a note about PulseAudio when running as a service
 2016-02-03 13:39:01 +01:00
Trygve Aaberge
7a06a71e6e docs: Add info about PulseAudio when running as a service 
When using PulseAudio and running Mopidy as a service, some
configuration has to be added for this. This documents what you have to
do.

The setup is based on these:
https://wiki.archlinux.org/index.php/PulseAudio/Examples#PulseAudio_over_network
https://github.com/mopidy/mopidy/issues/954#issuecomment-73369712
 2016-02-03 01:08:41 +01:00
Trygve Aaberge
0ca898fccd docs: Add a note about running as a service under config 
If only reading the config page, you might not have realized that the
config is located in another place when running Mopidy as a service.
 2016-02-03 01:05:51 +01:00
Stein Magnus Jodal
3429487f70 Merge pull request #1419 from mopidy/feature/gst1 
Port to GStreamer 1.x and PyGI
 2016-02-02 22:24:28 +01:00
Stein Magnus Jodal
e18ee4798f gst1: Fix docs typo 2016-02-02 15:00:57 +01:00
Stein Magnus Jodal
7df7b9d5f9 gst1: Add Audio API changes to changelog 2016-02-02 10:43:45 +01:00
Stein Magnus Jodal
b143898cd3 gst1: Adjust list of GStreamer packages needed on Arch 2016-02-01 20:27:36 +01:00
Stein Magnus Jodal
7daed28416 docs: ==dev installs are deprecated 2016-02-01 20:02:32 +01:00
Stein Magnus Jodal
dce7e1551d gst1: Simplify Gentoo install docs 2016-02-01 13:37:16 +01:00
Stein Magnus Jodal
efbfb39e86 docs: Update changelog 2016-01-31 21:07:17 +01:00
Stein Magnus Jodal
dd466ed895 docs: Update GStreamer install docs 2016-01-31 21:07:17 +01:00
Stein Magnus Jodal
adb260af05 Merge branch 'release-1.1' into develop 
Fixes #1400
 2016-01-31 07:47:47 +01:00
Thomas Kemmer
d139100261 Fix #1410: Link mopidy-local-{images,sqlite} to mopidy repo. 2016-01-28 21:07:51 +01:00
Jens Luetjen
e434556048 Merge branch 'develop' of https://github.com/mopidy/mopidy into fix/310-persist-mopidy-state-between-runs 
Conflicts:
	docs/changelog.rst
	mopidy/audio/scan.py

Resoved conflict.
 2016-01-21 19:33:58 +01:00
John Cass
dc1b5db4a7 Merge pull request #1406 from jcass77/fix/1402_track_playback_ended 
Missing changelog entries for PR #1403
 2016-01-21 09:37:42 +02:00
jcass
2b8cd9f24f fix:add reference to PR in changelog. 2016-01-21 05:59:57 +02:00
jcass
2fcbc691c0 fix:add changelog entry and fix line indentation. 2016-01-21 05:55:37 +02:00
jcass
c55a82b150 docs:fix syntax error in code sample. 2016-01-21 05:38:09 +02:00
jcass
edc3929daf docs:address PR review comments. 2016-01-20 11:49:29 +02:00
jcass
05729d3dc0 docs:fix bullet list formatting. 2016-01-20 09:36:07 +02:00
jcass
7f03b21258 docs:align case of headings with rest of section. Remove fragmented sentences. 2016-01-20 00:19:59 +02:00
jcass
ea89a85b5e docs:add section with some background and pointers on how to test extensions. 2016-01-20 00:07:15 +02:00
Stein Magnus Jodal
37a34a734c docs: Address @trygveaa's review comments 2016-01-18 23:01:46 +01:00
Stein Magnus Jodal
6d0e3ec698 docs: Update changelog for 1.1.2 2016-01-18 22:54:32 +01:00
Stein Magnus Jodal
b0b3bd85dc docs: Update copyright years 2016-01-18 22:54:32 +01:00
Trygve Aaberge
0c9618da14 Merge pull request #1397 from jodal/feature/mpd-volume-cmd 
MPD: Add volume command
 2016-01-18 22:49:49 +01:00
Stein Magnus Jodal
b09e667127 mpd: Fix review comments 2016-01-18 22:44:11 +01:00
Stein Magnus Jodal
77e2e088fd docs: Cleanup changelog 2016-01-18 22:34:10 +01:00
Stein Magnus Jodal
0ea3de2c68 docs: Refer to OS X service from service docs 2016-01-18 22:21:37 +01:00
Stein Magnus Jodal
2b0c121e6c docs: Refer to service docs from Arch and Debian install docs 2016-01-18 22:21:20 +01:00
Stein Magnus Jodal
bd0c88b22b docs: Fix title capitalization 2016-01-18 22:06:28 +01:00
Stein Magnus Jodal
123614ad69 docs: Repurpose Debian pkg page as a service page 
Fixes #1398
 2016-01-18 22:05:05 +01:00
Stein Magnus Jodal
e69ea22cdd docs: Remove old cruft from Debian package page 
Part of #1398
 2016-01-18 21:40:57 +01:00
Stein Magnus Jodal
450b1d0f7c docs: Remove section on missing Debian-packaged extensions 
For apt.mopidy.com, none of this is an issue.

For Ubuntu:
- none of this is an issue in 15.10 or 16.04 LTS.
- 15.04 is soon out of support.
- 14.04 LTS is old enough that you'll have to read older docs to expect
  facts matching your installation.

For Debian:
- none of this is an issue in sid or stretch.
- Jessie this might be an issue, but the same sentiment as for Ubuntu
  14.04 LTS applies.

Fixes #1399
 2016-01-18 21:29:25 +01:00
Stein Magnus Jodal
14444fe24f mpd: Add volume command 2016-01-17 22:28:23 +01:00
Stein Magnus Jodal
0ac77ebb47 docs: Remove Raspbmc and XBian workarounds 
Ref https://github.com/mopidy/mopidy/issues/1326#issuecomment-172323148

Raspbmc is replaced by OSMC that works with Mopidy without conflicts.

XBian I'm not sure about, but the workaround is still searchable in
older version of our docs, and we'll soon be moving to GStreamer 1.x,
probably affecting the dep on libtag.
 2016-01-17 21:06:55 +01:00
Stein Magnus Jodal
2a01760af3 docs: Update Raspberry Pi howto 
Fixes #1326
 2016-01-16 20:27:49 +01:00
Jens Luetjen
606e87b1bb Make export/restore state internal 
- drop filename parameter
- make save_state/load_state internal
- remove save_state/load_state from docu and RPC.
- remove models load/save from docu
- build the config path
- folder for 'core' state files
- move restore_state-to-coverage-translation into a method
 2016-01-14 19:56:38 +01:00
Thomas Kemmer
60b071dbbd m3u: Update changelog for PR #1386. 2016-01-10 20:08:20 +01:00
Thomas Kemmer
1715756b14 m3u: Update docs. 2016-01-10 19:45:00 +01:00
Stein Magnus Jodal
70b4851a29 docs: Add fix for bad event crash to changelog 
Fixes #1383
 2016-01-10 07:52:21 +01:00
Stein Magnus Jodal
3d6270ad37 docs: Document model's attributes 
Fixes #1385
 2016-01-10 07:41:52 +01:00
Stein Magnus Jodal
38307a5717 docs: Add PR#1371 to changelog 2016-01-05 21:18:57 +01:00
Jens Luetjen
0b0cbc87d4 Merge branch 'develop' into fix/310-persist-mopidy-state-between-runs 
Conflicts:
	docs/changelog.rst

Fixed conflict in doc/changelog.rst
 2016-01-05 08:16:51 +01:00
Jens Luetjen
6746dd0196 More function for config value core.restore_state 
- New values for core.restore_state : "volume", "last"
- Update changelog
- Adjust logger output
 2016-01-05 07:41:02 +01:00
Stein Magnus Jodal
7589d37f15 docs: Cleanup changelog 2016-01-03 23:41:46 +01:00
jcass
4e63e4280c Merge remote-tracking branch 'upstream/release-1.1' into fix/1378 2016-01-04 00:04:42 +02:00
jcass
aa140beda4 Fix changelog merge conflict. 2016-01-02 15:56:04 +02:00
Stein Magnus Jodal
f2194e9d5e fix: skip uplayable tracks when the next track is selected while in a paused state. 2016-01-02 15:51:17 +02:00
Stein Magnus Jodal
094a874055 core: Make lookup() ignore tracks without URI 
Fixes #1340
 2016-01-01 23:44:26 +01:00
Stein Magnus Jodal
19726832e7 docs: Add PR ref to changelog 2016-01-01 23:41:53 +01:00
Stein Magnus Jodal
6afd5b0c70 Fix tests and update changelog 2016-01-01 23:13:42 +01:00
Thomas Adamcik
92bb9b9b77 logging: Catch errors when loading logging/config_file 
(cherry picked from commit ede5b8abff)
 2016-01-01 22:54:41 +01:00
Stein Magnus Jodal
d85a3870d0 Merge branch 'master' into release-1.1 2016-01-01 22:32:08 +01:00
Stein Magnus Jodal
5462f0e319 Merge pull request #1369 from tkem/m3u-fix-1364 
m3u: Derive track name from file name for non-extended M3U playlists.
 2015-12-29 02:02:48 +01:00
Stein Magnus Jodal
2a04088544 Merge pull request #1362 from tkem/feature/playlists-schemes 
core: Add PlaylistsController.get_uri_schemes().
 2015-12-28 23:37:24 +01:00
jcass
25bd134531 docs: Provide details on procedure for submitting bug fixes for a minor release of Mopidy. 
(cherry picked from commit 8ca871cad9)
 2015-12-28 23:08:38 +01:00
Thomas Adamcik
cee4290302 Merge pull request #1374 from jcass77/fix/1355-docs-submitting-for-bugfix-release 
docs: Provide details on PR procedure for bug fix releases
 2015-12-28 22:42:33 +01:00
Jens Luetjen
e9625e9feb core: Fix #310: Persist mopidy state between runs. 
Persist following properties:
mopidy.core.tracklist
    _tl_tracks
    _next_tlid
    get_consume()
    get_random()
    get_repeat()
    get_single()
mopidy.core.history
    _history
mopidy.core.playlist
    get_current_tl_track()
    get_time_position()
mopidy.core.mixer
    get_volume()

Details:
- moved json export/import write_library()/load_library() from mopidy/local to mopidy/models
- new core methods save_state(), load_state()
- save_state(), load_state() accessible via rpc
- save state to disk at stop
- load state from disk at start
- new config: core.restore_state ("off", "load", "play")

TODO:
- seek to play position does not work. Timing issue.
- use extra thread to load state from disk at start?
 2015-12-27 19:28:41 +01:00
jcass
8c83ff7631 Fix documentation typos and inconsistencies. 
(cherry picked from commit 33a668c6c7)
 2015-12-27 10:18:50 +01:00
jcass
8ca871cad9 docs: Provide details on procedure for submitting bug fixes for a minor release of Mopidy. 2015-12-27 08:04:32 +02:00
jcass
33a668c6c7 Fix documentation typos and inconsistencies. 2015-12-26 18:50:58 +02:00
jcass
188bd11106 Fix typo. 2015-12-26 15:36:14 +02:00
Thomas Kemmer
22690ee5a9 m3u: Derive track name from file name for non-extended M3U playlists. 2015-12-23 18:14:19 +01:00
Thomas Kemmer
ef1468d8d6 core: Add PlaylistsController.get_uri_schemes(). 2015-12-13 19:02:33 +01:00
Stein Magnus Jodal
6f8b3ab1a2 docs: Add Mopidy-Spotmop 2015-12-09 22:26:55 +01:00
jcass
fb7b466bee Result of prepare_change no longer affects whether a track is added to the history. 
Update changelog and test cases.
 2015-12-07 07:53:34 +02:00
jcass
139634b93b Update changelog. 2015-12-06 19:27:02 +02:00
jcass
2b00e83179 Mark track as playing and add to history if changing track while paused. 2015-12-06 19:16:20 +02:00
Thomas Adamcik
ede5b8abff logging: Catch errors when loading logging/config_file 2015-12-05 22:44:39 +01:00
Thomas Adamcik
22ec9d9060 mpd: Add missing seeked event handling for idle 
Fixes #1331

(cherry picked from commit 19daa89e15)
 2015-12-05 22:19:29 +01:00
Stein Magnus Jodal
3e259f1c00 Merge pull request #1347 from adamcik/feature/mpd-idle-cleanup 
MPD idle cleanup
 2015-12-05 21:36:11 +01:00
Thomas Adamcik
1c2850bc3e docs: Use :issue: instead of :pr: 2015-12-05 21:24:18 +01:00
Thomas Adamcik
8c6bb63963 docs: Improve changelog PR#1346 per review comments 2015-12-05 11:34:15 +01:00
Thomas Adamcik
da84c0f59c docs: Update changelog for MPD idle fixes 2015-12-05 11:22:33 +01:00
Thomas Adamcik
438b4b7a35 docs: Update changelog with seek related changes 2015-12-04 23:09:48 +01:00
Thomas Adamcik
a086857dd7 docs: Update changelog with MPD idle fixes 2015-12-04 22:16:35 +01:00
Stein Magnus Jodal
e495e382e7 docs: Update changelog and authors 2015-11-28 23:54:44 +01:00
Stein Magnus Jodal
e48ac186f0 models: Deprecate Album.images 
Fixes #1325
 2015-11-18 15:03:13 +01:00