Commit f6284f7ca5fbb3e95cb062fc046f77f3d6adde37

Con Kolivas 2013-04-15T20:30:47

Merge branch 'master' into avalon-dev