Commit 42e8eac9dc5b6f1c239f23238327ab2dedf851f9

ckolivas 2013-04-17T15:58:21

Merge branch 'master' into avalon-dev