Merge branch 'cj/5285'
Authored by: Cory Johns 2012-11-19
Parent(s): [0f5a6a][1a519f]
Child(ren): [de961e]