refs #157
for activemodel4.0
Merge branch 'refs-157'