Merge branch 'db/4272' into dev
Authored by: Tim Van Steenburgh 2012-07-11
Parent(s): [84f38b][dd64b9]
Child(ren): [f5aa36]