Merge pull request #1 from Pteridium/devel

Devel
Merge pull request #2 from Pteridium/devel

Refresh patches.
Merge pull request #3 from Pteridium/next

Next