Merge commit '186d366721f0f810cb8f357aba55253c632321c8'
Authored by: Tim Van Steenburgh 2012-12-05
Parent(s): [186d36][d32c7e]
Child(ren): [be1441]