align separated out from origin
backwards compatibility with origin when align is not defined
align resets on new sizing context
Merge remote-tracking branch 'unforked/develop-originalign'