Revision de52c7eec96aadccbce640b27ffd086d936b0bc8

Committed on 02/10/2015 4:18 am by Philipp Kamps <pkamps@mugo.ca> [GitHub Diff]

Merge with CSM