See http://dev.w3.org/csswg/css3-flexbox/#flex-flow-wrap.
These are now both implemented. I'll be adding some more test cases and implementing flex-line-pack soon (bugs coming).