WinPython 2015-05#21

stonebig merged 3 commits into

winpython:masterwinpython/winpython.github.io:masterfrom

stonebig:masterstonebig/winpython.github.io:masterCopy head branch name to clipboard