Scott Mitchell 04a9b834e4 Fix merge error from f45d754
Motiviation:
Commit f45d754 from 4.1 was directly merged but interfaces were not updated.

Modifications:
- Fix areas where interfaces have changed between 4.1 and master

Result:
No more compile error.
2015-05-18 14:23:56 -07:00
..
2015-05-18 14:23:56 -07:00
2013-01-07 21:06:22 +01:00