Squashed commit of the following:

commit ea543cc5d8c06b01e642133a41930cfeac1f2bb0
Author: Timo <timoconsult@gmail.com>
Date:   Sat Mar 08 13:59:06 2014 +0100

	Merge remote-tracking branch 'origin/master'