Revision 1a1ffeb1e10f70519d999a80ff81e28430a20fc4

Committed on 19/07/2015 7:10 pm by Brookins Consulting <info@brookinsconsulting.com> [GitHub Diff]

Merge remote-tracking branch 'upstream/master'