Merging changes from upstream

Most recent changes from:

http://www.lstore.org/wp-content/uploads/2013/11/ibp_server-accre-dev.tar.gz