April 18, 2013 Merge of updates from opensimulator.org.  New updates to be merged daily.