Merge branch 'release/V20140123'
GeneticMakeupImpl fix - use gene.getId for map keys.