Cnntinuous Integration commit 20140822_163839
Cnntinuous Integration commit 20140822_165044
Merge branch 'master' into data-access-control