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