Merge remote-tracking branch 'temp/ticket-5357'
Authored by: Tim Van Steenburgh 2012-12-05
Parent(s): [49edd6][e46a4e]
Child(ren): [1cb7c1]