Revert "Revert "Alpha 6 (532) / 2014-08-31""

This reverts commit 0b83462438b15cde17b0a7e07e75f2b51ef85b66.