#630 marked as **In Review**  by @MWillisARC at 10:39 am on 8/12/14