Merging master to beta for v2015.01.rc1

Very early beta release, in order to give folks plenty of chances to test INAC scrubber.