reciprocity/ggrc-core — pull request #2126 by bmomberger-reciprocity (2014-12-31 18:59:59+00:00)
Title: CORE-864 merge conflict resolution for v0.9.0

This is a clone of PR #2034 from the develop mainline, being brought over as a hotfix since it isn't been generating errors and is needed to solve CORE-864

#resolve