Merging Dev into Master 20140918

master is too far behind right now to be useful anyways.