Merge pull request #484 from mhaskel/merge_master_to_next
authorDaniele Sluijters <daenney@users.noreply.github.com>
Thu, 26 Mar 2015 07:48:14 +0000 (08:48 +0100)
committerDaniele Sluijters <daenney@users.noreply.github.com>
Thu, 26 Mar 2015 07:48:14 +0000 (08:48 +0100)
Merge master to next


Trivial merge