Merge pull request #4128 from jmarshallnz/activeae_fixes
authorjmarshallnz <jcmarsha@gmail.com>
Tue, 4 Feb 2014 19:22:37 +0000 (11:22 -0800)
committerjmarshallnz <jcmarsha@gmail.com>
Tue, 4 Feb 2014 19:22:37 +0000 (11:22 -0800)
Activeae fix reliance on settings that may not be correct


Trivial merge