refs #9962
commit 13_04_2013_16-05
commit 13_04_2013_16-08
Merge branch 'rem_branch' of github.com:javitalik1/fff into rem_branch