Merge pull request #507 from mhaskel/merge_fixes_from_2.0.x
authorDaniele Sluijters <daenney@users.noreply.github.com>
Thu, 23 Apr 2015 21:48:43 +0000 (23:48 +0200)
committerDaniele Sluijters <daenney@users.noreply.github.com>
Thu, 23 Apr 2015 21:48:43 +0000 (23:48 +0200)
commitcf7271d7e60aca6ea265bda55fd99b80b1845186
tree83a760e7b3a421ca97b38b5be72619bdb3b3ea4a
parentbca85cd945f8511edb0aa2dcf5e549772abea805
parent80d83d9a88267737a8dbefb751322ce7bcc2b072
Merge pull request #507 from mhaskel/merge_fixes_from_2.0.x

Merge fixes from 2.0.x