jrogelstad/database — pull request #11 by jrogelstad (2012-11-29 16:46:15+00:00)
Title: Catch up.

issue #18428, issue# 18811: Merge to master.