Merge branch 'db/5755'
Authored by: Tim Van Steenburgh 2013-03-12
Parent(s): [234ef7][ea380e]
Child(ren): [0e7d7f]