Merge branch 'development' into development-restricted

Conflicts:
	programs/pkey/rsa_decrypt.c
	programs/pkey/rsa_encrypt.c
	programs/test/selftest.c

programs/test/selftest.c

@@ -397,6 +397,7 @@ int main( int argc, char *argv[] )
     if( suites_failed > 0)
         mbedtls_exit( MBEDTLS_EXIT_FAILURE );
 
+    /* return() is here to prevent compiler warnings */
     return( MBEDTLS_EXIT_SUCCESS );
 }