Merge pull request #661 from rustyswayne/1.2.0

Boarding for DK ... on to CodeGarden 14 =)