Commit bb622822da51ec0b3b01a7b68ee341204ffdbebc

Steffen Jaeckel 2013-11-24T15:20:36

Merge branch 'ccbrown/master' into develop