updating the develop branch from subversion 10-03-14