Labradoodle-360/Secret-Lair — pull request #1 by mikemill (2012-12-16 19:24:59+00:00)
Title: Merge conflict resolved

Merged in SMF/release-2.1 which will resolve the merge conflict for #258