Pull request for merging the natty changes as on the channelwad (topics) branch directly into flashlight master