Merged bug fix from Stable into Unstable

This commit is contained in:
Christopher Hartl 2012-09-27 00:15:35 -04:00
commit abbe757907

Diff Content Not Available