Merge branch 'develop'

Conflicts:
	examples/standalone.py
Merge branch 'develop'

Conflicts:
	examples/standalone.py
pt
pt
pt
pt
pt
pt
pt
pt
pt
mac
mac
pt
pt
Merge branch 'develop' of https://github.com/woopeex/edd into experimental
no message