Revision 691b097e3e3d1900f6b4b7a1c91394834ed947be

Committed on 30/08/2014 6:37 am by Brookins Consulting <info@brookinsconsulting.com> [GitHub Diff]

Merge remote-tracking branch 'origin/master' into 5.x