Merge branch 'master' into static

include/assimp/Importer.hpp

@@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Public ASSIMP data structures
 #include <assimp/types.h>
 
-//#include <exception>
+#include <exception>
 
 namespace Assimp {
 // =======================================================================