Fixed an import error
Clarified some wording. Hopefully.
Merge branch 'release/2014-10-12.0' into develop