Revision 30721990a97e05c9c4f07b1c01f4e07fff1cc7c6

Committed on 29/12/2015 3:49 am by Philipp Kamps <pkamps@mugo.ca> [GitHub Diff]

Merged with CSM version