Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Fri, 6 May 2016 23:59:39 +0000 (17:59 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 6 May 2016 23:59:39 +0000 (17:59 -0600)
commitac7be4a40df88ee3a0992e041635e4ac4cf5ac48
treeee3c747b2ee98b772e02dce604b58878e9336def
parentb53c78e75879d647935a30acb88fdd69467617a7
parentce4c8a8ad57515e851207b0a82f3af791bb30d3e
Merge branch 'master' into branch-1.6