flavour/eden — pull request #1015 by ramdesh (2014-12-30 07:34:27+00:00)
Title: PR from GCI staging_done branch

Had to do some conflict resolution as well. :|