2013 updates

Signed-off-by: Thomas Yuill <thomas.yuill@gmail.com>
updates

Signed-off-by: Thomas Yuill <thomas.yuill@gmail.com>
Merge branch 'refs/heads/2013'