Commit 489bf69f65bf1bd260d9877a95eab3af8107e35e

Steffen Jaeckel 2015-11-12T01:33:57

Merge branch '20151025_lint' into develop This closes #38