Merge remote-tracking branch 'abhinav/lll' into trunk
Merge branch 'trunk' of git://github.com/wbhart/flint2 into lll