Fixup 87237fa61a3982f41a12742f5ad15e7a6dc0efc5#704
Merged
auhlig merged 1 commit intoContainX:masterfrom Jun 4, 2016
olivergondza:fixup-refactoring
Merged
Fixup 87237fa61a3982f41a12742f5ad15e7a6dc0efc5#704auhlig merged 1 commit intoContainX:masterfrom olivergondza:fixup-refactoring
auhlig merged 1 commit intoContainX:masterfrom
olivergondza:fixup-refactoring
