commiting E1476 after merging the latest expertiza rails4 branch