merge latest release 2.4.0 upstream upstream/2.4.0
authorImran Zaman <imran.zaman@intel.com>
Thu, 12 Feb 2015 13:39:52 +0000 (15:39 +0200)
committerImran Zaman <imran.zaman@intel.com>
Thu, 12 Feb 2015 13:40:07 +0000 (15:40 +0200)

Trivial merge