Merge remote-tracking branch 'team/master' into svn
Merge commit '6948ee3663847c3fb6ecaed988249d0ace129392' into svn
Merge commit '148c4f7b4a2fb0f00a1d4026f5f9bb61609ed56a' into svn
Merge commit 'ca6256fde022a129cb5b2023288a717872dc5b3f' into subversion
Rework calculation of compiler args; add IMX_SAFE switch
Enable ubsan for gcc 4.9+
Don't abort build if NPSOL is not found for a particular compiler
Temporarily disable NLOPT (didn't mean to revert this)
Revert "Temporarily disable NLOPT"
This reverts commit 855dfbe8729be37651015c9462e35dfc59bbecd9.